Bug 398810 - "Remove MOZILLA_1_8_BRANCH ifdefs from core on trunk" (metric extension only) [p=mh+mozilla@glandium.org (Mike Hommey) r=pete (NPOTB)]

extensions/metrics/build/nsMetricsModule.cpp

@@ -48,9 +48,7 @@
 #include "nsServiceManagerUtils.h"
 #include "nsCOMPtr.h"
 #include "nsXPCOMCID.h"
-#ifndef MOZILLA_1_8_BRANCH
 #include "nsIClassInfoImpl.h"
-#endif
 
 NS_DECL_CLASSINFO(nsMetricsService)
 

extensions/metrics/src/nsLoadCollector.cpp

@@ -52,28 +52,7 @@
 #include "nsIDOMDocument.h"
 
 // Hack around internal string usage in nsIDocument.h on the branch
-#ifdef MOZILLA_1_8_BRANCH
-// nsAFlat[C]String is a deprecated synonym for ns[C]String
-typedef nsString nsAFlatString;
-typedef nsCString nsAFlatCString;
-// nsXPIDLCString is a subclass of nsCString, but they're equivalent for the
-// purposes of nsIDocument.h.
-typedef nsCString nsXPIDLCString;
-// This utility method isn't in the string glue on the branch.
-inline void CopyASCIItoUCS2(const nsACString &src, nsAString &dest) {
-  NS_CStringToUTF16(src, NS_CSTRING_ENCODING_ASCII, dest);
-}
-// Suppress inclusion of these headers
-#define nsAString_h___
-#define nsString_h___
-#define nsReadableUtils_h___
-#endif
 #include "nsIDocument.h"
-#ifdef MOZILLA_1_8_BRANCH
-#undef nsAString_h___
-#undef nsString_h___
-#undef nsReadableUtils_h___
-#endif
 
 // This is needed to gain access to the LOAD_ defines in this file.
 #define MOZILLA_INTERNAL_API
@@ -506,9 +485,6 @@ nsLoadCollector::OnNewLog()
 }
 
 NS_IMPL_NSIDOCUMENTOBSERVER_LOAD_STUB(nsLoadCollector)
-#ifdef MOZILLA_1_8_BRANCH
-NS_IMPL_NSIDOCUMENTOBSERVER_REFLOW_STUB(nsLoadCollector)
-#endif
 NS_IMPL_NSIDOCUMENTOBSERVER_STATE_STUB(nsLoadCollector)
 NS_IMPL_NSIDOCUMENTOBSERVER_CONTENT(nsLoadCollector)
 NS_IMPL_NSIDOCUMENTOBSERVER_STYLE_STUB(nsLoadCollector)

extensions/metrics/src/nsMetricsService.cpp

@@ -75,9 +75,7 @@
 #include "prprf.h"
 #include "prrng.h"
 #include "bzlib.h"
-#ifndef MOZILLA_1_8_BRANCH
 #include "nsIClassInfoImpl.h"
-#endif
 #include "nsIDocShellTreeItem.h"
 #include "nsDocShellCID.h"
 #include "nsMemory.h"

extensions/metrics/test/TestMetricsConfig.cpp

@@ -43,9 +43,7 @@
 #include "nsMetricsService.h"
 #include "nsXPCOM.h"
 #include "nsILocalFile.h"
-#ifndef MOZILLA_1_8_BRANCH
 #include "nsIClassInfoImpl.h"
-#endif
 
 #include <stdio.h>