Backed out changeset e2d5b2be4142 (bug 994971) for non-unified bustage.

CLOSED TREE

content/base/src/moz.build

@@ -229,7 +229,6 @@ LOCAL_INCLUDES += [
     '/layout/svg',
     '/layout/xul',
     '/netwerk/base/src',
-    '/xpcom/ds',
 ]
 
 if CONFIG['GNU_CC'] and CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android':

content/base/src/nsContentUtils.cpp

@@ -124,7 +124,6 @@
 #include "nsILineBreaker.h"
 #include "nsILoadContext.h"
 #include "nsILoadGroup.h"
-#include "nsIMemoryReporter.h"
 #include "nsIMIMEService.h"
 #include "nsINode.h"
 #include "nsINodeInfo.h"

content/media/Latency.h

@@ -13,7 +13,7 @@
 #include "nsIThread.h"
 #include "mozilla/Monitor.h"
 #include "nsISupportsImpl.h"
-#include "nsIObserver.h"
+#include "nsObserverService.h"
 
 class AsyncLatencyLogger;
 class LogEvent;

dom/camera/DOMCameraManager.cpp

@@ -9,7 +9,7 @@
 #include "nsPIDOMWindow.h"
 #include "mozilla/Services.h"
 #include "nsContentPermissionHelper.h"
-#include "nsIObserverService.h"
+#include "nsObserverService.h"
 #include "nsIPermissionManager.h"
 #include "DOMCameraControl.h"
 #include "nsDOMClassInfo.h"

dom/media/MediaManager.h

@@ -11,7 +11,7 @@
 #include "nsGlobalWindow.h"
 #include "nsClassHashtable.h"
 #include "nsRefPtrHashtable.h"
-#include "nsIObserver.h"
+#include "nsObserverService.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 

hal/HalWakeLock.cpp

@@ -12,7 +12,7 @@
 #include "nsDataHashtable.h"
 #include "nsHashKeys.h"
 #include "nsIPropertyBag2.h"
-#include "nsIObserverService.h"
+#include "nsObserverService.h"
 
 using namespace mozilla;
 using namespace mozilla::hal;

hal/cocoa/CocoaBattery.cpp

@@ -12,7 +12,7 @@
 #include <mozilla/dom/battery/Constants.h>
 #include <mozilla/Services.h>
 
-#include <nsIObserverService.h>
+#include <nsObserverService.h>
 
 #include <dlfcn.h>
 

xpcom/ds/moz.build

@@ -53,6 +53,8 @@ EXPORTS += [
     'nsHashPropertyBag.h',
     'nsHashtable.h',
     'nsMathUtils.h',
+    'nsObserverList.h',
+    'nsObserverService.h',
     'nsStaticAtom.h',
     'nsStaticNameTable.h',
     'nsStringEnumerator.h',