Bug 920551 - 2.e/2: fix MobileConnection. r=hsinyi,khuey

b2g/app/b2g.js

@@ -820,9 +820,6 @@ pref("gfx.canvas.skiagl.dynamic-cache", true);
 // Cell Broadcast API
 pref("ril.cellbroadcast.disabled", false);
 
-// Mobile Connection API
-pref("dom.mobileconnection.enabled", true);
-
 // Voice Mail API
 pref("dom.voicemail.enabled", true);
 

dom/base/Navigator.cpp

@@ -39,8 +39,8 @@
 #include "nsGlobalWindow.h"
 #ifdef MOZ_B2G_RIL
 #include "mozilla/dom/IccManager.h"
-#include "MobileConnection.h"
 #include "mozilla/dom/CellBroadcast.h"
+#include "mozilla/dom/network/MobileConnection.h"
 #include "mozilla/dom/Voicemail.h"
 #endif
 #include "nsIIdleObserver.h"

dom/network/interfaces/moz.build

@@ -6,10 +6,8 @@
 
 XPIDL_SOURCES += [
     'nsIDOMConnection.idl',
-    'nsIDOMDataErrorEvent.idl',
     'nsIDOMTCPServerSocket.idl',
     'nsIDOMTCPSocket.idl',
-    'nsIDOMUSSDReceivedEvent.idl',
     'nsIMozNavigatorNetwork.idl',
     'nsITCPServerSocketChild.idl',
     'nsITCPServerSocketParent.idl',
@@ -20,11 +18,13 @@ XPIDL_SOURCES += [
 if CONFIG['MOZ_B2G_RIL']:
     XPIDL_SOURCES += [
         'nsIDOMCFStateChangeEvent.idl',
+        'nsIDOMDataErrorEvent.idl',
         'nsIDOMMobileConnection.idl',
         'nsIDOMMozEmergencyCbModeEvent.idl',
         'nsIDOMMozOtaStatusEvent.idl',
         'nsIDOMNetworkStats.idl',
         'nsIDOMNetworkStatsManager.idl',
+        'nsIDOMUSSDReceivedEvent.idl',
         'nsIMobileConnectionProvider.idl',
         'nsINetworkStatsServiceProxy.idl',
     ]

dom/network/src/MobileConnection.cpp

@@ -2,7 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "MobileConnection.h"
+#include "mozilla/dom/network/MobileConnection.h"
+
 #include "GeneratedEvents.h"
 #include "mozilla/Preferences.h"
 #include "nsDOMEvent.h"

dom/network/src/moz.build

@@ -22,6 +22,9 @@ CPP_SOURCES += [
 ]
 
 if CONFIG['MOZ_B2G_RIL']:
+    EXPORTS.mozilla.dom.network += [
+        'MobileConnection.h',
+    ]
     CPP_SOURCES += [
         'MobileConnection.cpp',
     ]

modules/libpref/src/init/all.js

@@ -4509,7 +4509,11 @@ pref("dom.icc.enabled", false);
 #endif
 
 // Mobile Connection API
+#ifdef MOZ_B2G_RIL
+pref("dom.mobileconnection.enabled", true);
+#else
 pref("dom.mobileconnection.enabled", false);
+#endif
 
 // Voice Mail API
 pref("dom.voicemail.enabled", false);