Bug 914826 - part 4 - fix source files that were bootlegging XPCOM do_* functions via generated ipdl headers; r=ehsan

dom/audiochannel/AudioChannelService.cpp

@@ -18,6 +18,8 @@
 
 #include "nsThreadUtils.h"
 #include "nsHashPropertyBag.h"
+#include "nsComponentManagerUtils.h"
+#include "nsServiceManagerUtils.h"
 
 #ifdef MOZ_WIDGET_GONK
 #include "nsJSUtils.h"

dom/base/Crypto.cpp

@@ -11,6 +11,7 @@
 
 #include "mozilla/dom/ContentChild.h"
 #include "mozilla/dom/CryptoBinding.h"
+#include "nsServiceManagerUtils.h"
 
 using mozilla::dom::ContentChild;
 

dom/base/nsContentPermissionHelper.cpp

@@ -9,6 +9,7 @@
 #include "nsIPrincipal.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/unused.h"
+#include "nsComponentManagerUtils.h"
 
 using mozilla::unused;          // <snicker>
 using namespace mozilla::dom;

dom/base/nsDOMWindowUtils.cpp

@@ -82,6 +82,7 @@
 #include "nsIBaseWindow.h"
 #include "nsIDocShellTreeOwner.h"
 #include "nsIInterfaceRequestorUtils.h"
+#include "GeckoProfiler.h"
 
 #ifdef XP_WIN
 #undef GetClassName

dom/bluetooth/BluetoothA2dpManager.cpp

@@ -337,8 +337,7 @@ BluetoothA2dpManager::NotifyConnectionStatusChanged()
   MOZ_ASSERT(NS_IsMainThread());
 
   // Notify Gecko observers
-  nsCOMPtr<nsIObserverService> obs =
-    do_GetService("@mozilla.org/observer-service;1");
+  nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
   NS_ENSURE_TRUE_VOID(obs);
 
   if (NS_FAILED(obs->NotifyObservers(this,

dom/bluetooth/BluetoothHfpManager.cpp

@@ -27,6 +27,7 @@
 #include "nsISettingsService.h"
 #include "nsITelephonyProvider.h"
 #include "nsRadioInterfaceLayer.h"
+#include "nsServiceManagerUtils.h"
 
 /**
  * BRSF bitmask of AG supported features. See 4.34.1 "Bluetooth Defined AT
@@ -448,8 +449,7 @@ BluetoothHfpManager::NotifyConnectionStatusChanged(const nsAString& aType)
   MOZ_ASSERT(NS_IsMainThread());
 
   // Notify Gecko observers
-  nsCOMPtr<nsIObserverService> obs =
-    do_GetService("@mozilla.org/observer-service;1");
+  nsCOMPtr<nsIObserverService> obs = services::GetObserverService();
   NS_ENSURE_TRUE_VOID(obs);
 
   if (NS_FAILED(obs->NotifyObservers(this, NS_ConvertUTF16toUTF8(aType).get(),

dom/bluetooth/BluetoothOppManager.cpp

@@ -30,6 +30,7 @@
 #include "nsIOutputStream.h"
 #include "nsIVolumeService.h"
 #include "nsNetUtil.h"
+#include "nsServiceManagerUtils.h"
 
 #define TARGET_SUBDIR "Download/Bluetooth/"
 

dom/bluetooth/BluetoothPropertyContainer.cpp

@@ -10,6 +10,7 @@
 #include "DOMRequest.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/dom/bluetooth/BluetoothTypes.h"
+#include "nsServiceManagerUtils.h"
 
 USING_BLUETOOTH_NAMESPACE
 

dom/bluetooth/BluetoothReplyRunnable.cpp

@@ -8,6 +8,7 @@
 #include "BluetoothReplyRunnable.h"
 #include "DOMRequest.h"
 #include "mozilla/dom/bluetooth/BluetoothTypes.h"
+#include "nsServiceManagerUtils.h"
 
 USING_BLUETOOTH_NAMESPACE
 

dom/bluetooth/BluetoothService.cpp

@@ -34,6 +34,7 @@
 #include "nsISettingsService.h"
 #include "nsISystemMessagesInternal.h"
 #include "nsITimer.h"
+#include "nsServiceManagerUtils.h"
 #include "nsThreadUtils.h"
 #include "nsXPCOM.h"
 

dom/bluetooth/BluetoothUtils.cpp

@@ -18,6 +18,7 @@
 #include "nsISystemMessagesInternal.h"
 #include "nsString.h"
 #include "nsTArray.h"
+#include "nsServiceManagerUtils.h"
 
 BEGIN_BLUETOOTH_NAMESPACE
 

dom/ipc/ProcessPriorityManager.cpp

@@ -24,6 +24,7 @@
 #include "nsIObserver.h"
 #include "nsITimer.h"
 #include "nsIPropertyBag2.h"
+#include "nsComponentManagerUtils.h"
 
 #ifdef XP_WIN
 #include <process.h>

dom/ipc/TabContext.cpp

@@ -10,6 +10,7 @@
 #include "mozilla/dom/TabChild.h"
 #include "nsIAppsService.h"
 #include "nsIScriptSecurityManager.h"
+#include "nsServiceManagerUtils.h"
 
 #define NO_APP_ID (nsIScriptSecurityManager::NO_APP_ID)
 

dom/media/MediaPermissionGonk.cpp

@@ -19,6 +19,7 @@
 #include "mozilla/dom/TabChild.h"
 #include "mozilla/dom/MediaStreamTrackBinding.h"
 #include "nsISupportsPrimitives.h"
+#include "nsServiceManagerUtils.h"
 
 #define AUDIO_PERMISSION_NAME "audio-capture"
 

dom/mobilemessage/src/gonk/SmsService.cpp

@@ -7,6 +7,7 @@
 #include "SmsService.h"
 #include "jsapi.h"
 #include "SmsSegmentInfo.h"
+#include "nsServiceManagerUtils.h"
 
 namespace mozilla {
 namespace dom {

dom/mobilemessage/src/ipc/SmsParent.cpp

@@ -24,6 +24,7 @@
 #include "nsContentUtils.h"
 #include "nsTArrayHelpers.h"
 #include "nsCxPusher.h"
+#include "nsServiceManagerUtils.h"
 
 namespace mozilla {
 namespace dom {

dom/plugins/ipc/PluginModuleParent.cpp

@@ -30,6 +30,7 @@
 #include "nsPrintfCString.h"
 #include "PluginIdentifierParent.h"
 #include "prsystem.h"
+#include "GeckoProfiler.h"
 
 #ifdef XP_WIN
 #include "PluginHangUIParent.h"

dom/src/notification/DesktopNotification.cpp

@@ -13,6 +13,7 @@
 #include "nsIAppsService.h"
 #include "PCOMContentPermissionRequestChild.h"
 #include "nsIScriptSecurityManager.h"
+#include "nsServiceManagerUtils.h"
 
 namespace mozilla {
 namespace dom {

dom/system/gonk/AudioManager.cpp

@@ -33,6 +33,8 @@
 #include "nsJSUtils.h"
 #include "nsCxPusher.h"
 #include "nsThreadUtils.h"
+#include "nsServiceManagerUtils.h"
+#include "nsComponentManagerUtils.h"
 
 using namespace mozilla::dom::gonk;
 using namespace android;

dom/system/gonk/nsVolumeMountLock.cpp

@@ -16,6 +16,7 @@
 
 #define VOLUME_MANAGER_LOG_TAG  "nsVolumeMountLock"
 #include "VolumeManagerLog.h"
+#include "nsServiceManagerUtils.h"
 
 using namespace mozilla::dom;
 using namespace mozilla::services;

dom/telephony/ipc/TelephonyParent.cpp

@@ -4,6 +4,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "mozilla/dom/telephony/TelephonyParent.h"
+#include "nsServiceManagerUtils.h"
 
 USING_TELEPHONY_NAMESPACE
 

hal/android/AndroidHal.cpp

@@ -10,6 +10,7 @@
 #include "mozilla/dom/network/Constants.h"
 #include "mozilla/dom/ScreenOrientation.h"
 #include "nsIScreenManager.h"
+#include "nsServiceManagerUtils.h"
 
 using namespace mozilla::dom;
 using namespace mozilla::hal;

hal/cocoa/CocoaSensor.mm

@@ -4,6 +4,7 @@
 #include "Hal.h"
 #include "nsITimer.h"
 #include "smslib.h"
+#include "nsComponentManagerUtils.h"
 
 #include <mach/mach.h>
 #include <cmath>

hal/fallback/FallbackAlarm.cpp

@@ -6,10 +6,10 @@
 
 #include <algorithm>
 
-#include <nsITimer.h>
-
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/StaticPtr.h"
+#include "nsComponentManagerUtils.h"
+#include "nsITimer.h"
 #include "nsThreadUtils.h"
 
 namespace mozilla {

hal/fallback/FallbackScreenConfiguration.cpp

@@ -5,6 +5,7 @@
 #include "Hal.h"
 #include "mozilla/dom/ScreenOrientation.h"
 #include "nsIScreenManager.h"
+#include "nsServiceManagerUtils.h"
 
 namespace mozilla {
 namespace hal_impl {

hal/windows/WindowsBattery.cpp

@@ -8,6 +8,7 @@
 #include "nsITimer.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/dom/battery/Constants.h"
+#include "nsComponentManagerUtils.h"
 
 #include <windows.h>
 #include "nsWindowsHelpers.h"

layout/generic/nsSubDocumentFrame.cpp

@@ -36,6 +36,7 @@
 #include "nsObjectFrame.h"
 #include "nsContentUtils.h"
 #include "nsIPermissionManager.h"
+#include "nsServiceManagerUtils.h"
 
 using namespace mozilla;
 using mozilla::layout::RenderFrameParent;

toolkit/xre/ProfileReset.h

@@ -4,7 +4,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "nsIToolkitProfileService.h"
-
+#include "nsIFile.h"
 #include "nsThreadUtils.h"
 
 static bool gProfileResetCleanupCompleted = false;

widget/gonk/OrientationObserver.cpp

@@ -24,6 +24,7 @@
 #include "OrientationObserver.h"
 #include "mozilla/HalSensor.h"
 #include "ProcessOrientation.h"
+#include "nsServiceManagerUtils.h"
 
 using namespace mozilla;
 using namespace dom;

widget/gonk/OrientationObserver.h

@@ -20,6 +20,7 @@
 
 #include "mozilla/Observer.h"
 #include "mozilla/dom/ScreenOrientation.h"
+#include "mozilla/Scoped.h"
 
 namespace mozilla {
 class ProcessOrientation;

xpcom/base/nsMemoryInfoDumper.cpp

@@ -20,6 +20,8 @@
 #include "nsJSEnvironment.h"
 #include "nsPrintfCString.h"
 #include "nsISimpleEnumerator.h"
+#include "nsServiceManagerUtils.h"
+#include "nsIFile.h"
 #include <errno.h>
 
 #ifdef XP_WIN