Bug 1072275 - MobileConnectionService doesn't have to be created in 'profile-after-change' category. r=smaug
authorEdgar Chen <echen@mozilla.com>
Thu, 16 Oct 2014 09:57:38 +0800
changeset 210967 0bd52a74a87265240769e81ce1b9dd020d5d5408
parent 210966 5a94075c9bcfc814f40c0841da3c0bfb3d462aed
child 210968 f48207f25d853583fa23d3eaf59197e47acc1a54
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewerssmaug
bugs1072275
milestone36.0a1
Bug 1072275 - MobileConnectionService doesn't have to be created in 'profile-after-change' category. r=smaug
dom/mobileconnection/MobileConnectionArray.cpp
layout/build/nsLayoutModule.cpp
--- a/dom/mobileconnection/MobileConnectionArray.cpp
+++ b/dom/mobileconnection/MobileConnectionArray.cpp
@@ -100,14 +100,14 @@ already_AddRefed<nsIMobileConnectionServ
 NS_CreateMobileConnectionService()
 {
   nsCOMPtr<nsIMobileConnectionService> service;
 
   if (XRE_GetProcessType() == GeckoProcessType_Content) {
     service = new mozilla::dom::mobileconnection::MobileConnectionIPCService();
   } else {
 #if defined(MOZ_WIDGET_GONK) && defined(MOZ_B2G_RIL)
-    service = do_CreateInstance(GONK_MOBILECONNECTION_SERVICE_CONTRACTID);
+    service = do_GetService(GONK_MOBILECONNECTION_SERVICE_CONTRACTID);
 #endif
   }
 
   return service.forget();
 }
--- a/layout/build/nsLayoutModule.cpp
+++ b/layout/build/nsLayoutModule.cpp
@@ -1252,17 +1252,16 @@ static const mozilla::Module::CategoryEn
 #endif
   CONTENTDLF_CATEGORIES
 #ifdef MOZ_WIDGET_GONK
   { "profile-after-change", "Gonk System Worker Manager", SYSTEMWORKERMANAGER_CONTRACTID },
 #endif
 #ifdef MOZ_B2G_BT
   { "profile-after-change", "Bluetooth Service", BLUETOOTHSERVICE_CONTRACTID },
 #endif
-  { "profile-after-change", "MobileConnection Service", NS_MOBILE_CONNECTION_SERVICE_CONTRACTID },
   { nullptr }
 };
 
 static void
 LayoutModuleDtor()
 {
   Shutdown();
   nsContentUtils::XPCOMShutdown();