Merge mozilla-central and b2g-inbound
authorEd Morley <emorley@mozilla.com>
Wed, 11 Jun 2014 10:10:59 +0100
changeset 208934 55e7d4f6af7dbbe2404591b61a956fdd5af151c7
parent 208811 18c21532848a1673c6c3fe57e710fbf6e9cb35e1 (current diff)
parent 208933 1822fa2791915f537413f25929291f41c5305814 (diff)
child 208935 c160ff0f51ca6d54d7bec2fb7c435a2fa8455f19
push id3857
push userraliiev@mozilla.com
push dateTue, 02 Sep 2014 16:39:23 +0000
treeherdermozilla-beta@5638b907b505 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge mozilla-central and b2g-inbound
dom/cellbroadcast/interfaces/nsIDOMMozCellBroadcastEvent.idl
dom/mobilemessage/interfaces/nsIDOMMozMmsEvent.idl
dom/mobilemessage/interfaces/nsIDOMMozSmsEvent.idl
dom/telephony/CallEvent.cpp
dom/telephony/CallEvent.h
dom/voicemail/nsIDOMMozVoicemailEvent.idl
dom/wifi/nsIDOMMozWifiConnectionInfoEvent.idl
dom/wifi/nsIDOMMozWifiP2pStatusChangeEvent.idl
dom/wifi/nsIDOMMozWifiStationInfoEvent.idl
dom/wifi/nsIDOMMozWifiStatusChangeEvent.idl
--- a/b2g/config/emulator-ics/sources.xml
+++ b/b2g/config/emulator-ics/sources.xml
@@ -14,17 +14,17 @@
   <!--original fetch url was git://github.com/apitrace/-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="refs/tags/android-4.0.4_r2.1" sync-j="4"/>
   <!-- Gonk specific things and forks -->
   <project name="platform_build" path="build" remote="b2g" revision="2a165bebfa19b11b697837409f9550dd2917c46c">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0750f66a0004870773c9a743fa6bdbe124379336"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="b85f072304d7b3eead596100182fd1b1f1adc421"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="dbb66e540194a187326cece28ae0b51cdd500184"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
   <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="a819a94a572c7b32556435491ed8eaab841a95ff"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="cabebb87fcd32f8596af08e6b5e80764ee0157dd"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
--- a/b2g/config/emulator-jb/sources.xml
+++ b/b2g/config/emulator-jb/sources.xml
@@ -12,17 +12,17 @@
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="cc67f31dc638c0b7edba3cf7e3d87cadf0ed52bf">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0750f66a0004870773c9a743fa6bdbe124379336"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b85f072304d7b3eead596100182fd1b1f1adc421"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="dbb66e540194a187326cece28ae0b51cdd500184"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="cabebb87fcd32f8596af08e6b5e80764ee0157dd"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
   <project groups="linux" name="platform/prebuilts/clang/linux-x86/3.1" path="prebuilts/clang/linux-x86/3.1" revision="5c45f43419d5582949284eee9cef0c43d866e03b"/>
   <project groups="linux" name="platform/prebuilts/clang/linux-x86/3.2" path="prebuilts/clang/linux-x86/3.2" revision="3748b4168e7bd8d46457d4b6786003bc6a5223ce"/>
--- a/b2g/config/emulator-kk/sources.xml
+++ b/b2g/config/emulator-kk/sources.xml
@@ -10,17 +10,17 @@
   <!--original fetch url was git://codeaurora.org/-->
   <remote fetch="https://git.mozilla.org/external/caf" name="caf"/>
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="276ce45e78b09c4a4ee643646f691d22804754c1">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0750f66a0004870773c9a743fa6bdbe124379336"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b85f072304d7b3eead596100182fd1b1f1adc421"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="dbb66e540194a187326cece28ae0b51cdd500184"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="cabebb87fcd32f8596af08e6b5e80764ee0157dd"/>
--- a/b2g/config/emulator/sources.xml
+++ b/b2g/config/emulator/sources.xml
@@ -14,17 +14,17 @@
   <!--original fetch url was git://github.com/apitrace/-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="refs/tags/android-4.0.4_r2.1" sync-j="4"/>
   <!-- Gonk specific things and forks -->
   <project name="platform_build" path="build" remote="b2g" revision="2a165bebfa19b11b697837409f9550dd2917c46c">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0750f66a0004870773c9a743fa6bdbe124379336"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="b85f072304d7b3eead596100182fd1b1f1adc421"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="dbb66e540194a187326cece28ae0b51cdd500184"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="platform_hardware_ril" path="hardware/ril" remote="b2g" revision="8e4420c0c5c8e8c8e58a000278a7129403769f96"/>
   <project name="platform_external_qemu" path="external/qemu" remote="b2g" revision="a819a94a572c7b32556435491ed8eaab841a95ff"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="cabebb87fcd32f8596af08e6b5e80764ee0157dd"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="dd924f92906085b831bf1cbbc7484d3c043d613c"/>
--- a/b2g/config/flame/sources.xml
+++ b/b2g/config/flame/sources.xml
@@ -12,17 +12,17 @@
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="cc67f31dc638c0b7edba3cf7e3d87cadf0ed52bf">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0750f66a0004870773c9a743fa6bdbe124379336"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b85f072304d7b3eead596100182fd1b1f1adc421"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="dbb66e540194a187326cece28ae0b51cdd500184"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="cabebb87fcd32f8596af08e6b5e80764ee0157dd"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
   <project groups="linux" name="platform/prebuilts/clang/linux-x86/3.1" path="prebuilts/clang/linux-x86/3.1" revision="e95b4ce22c825da44d14299e1190ea39a5260bde"/>
   <project groups="linux" name="platform/prebuilts/clang/linux-x86/3.2" path="prebuilts/clang/linux-x86/3.2" revision="471afab478649078ad7c75ec6b252481a59e19b8"/>
@@ -113,17 +113,17 @@
   <project name="platform/system/media" path="system/media" revision="df2cdd433738a891102873710bdd3c3db7adb0cc"/>
   <project name="platform/system/netd" path="system/netd" revision="ea8103eae5642621ca8202e00620f4ca954ed413"/>
   <project name="platform/system/security" path="system/security" revision="360f51f7af191316cd739f229db1c5f7233be063"/>
   <project name="platform/system/vold" path="system/vold" revision="153df4d067a4149c7d78f1c92fed2ce2bd6a272e"/>
   <default remote="caf" revision="jb_3.2" sync-j="4"/>
   <!-- Flame specific things -->
   <project name="device/generic/armv7-a-neon" path="device/generic/armv7-a-neon" revision="e8a318f7690092e639ba88891606f4183e846d3f"/>
   <project name="device/qcom/common" path="device/qcom/common" revision="34ed8345250bb97262d70a052217a92e83444ede"/>
-  <project name="device-flame" path="device/t2m/flame" remote="b2g" revision="70c66225521828ad568c0c72859c6f17c3182f1b"/>
+  <project name="device-flame" path="device/t2m/flame" remote="b2g" revision="b8ff7901a20aab3041aaca4eb73abd6d57f4bb8a"/>
   <project name="codeaurora_kernel_msm" path="kernel" remote="b2g" revision="6d29b672b039612c08c40e92d8051a4cfbd38162"/>
   <project name="kernel_lk" path="bootable/bootloader/lk" remote="b2g" revision="2b1d8b5b7a760230f4c94c02e733e3929f44253a"/>
   <project name="platform/bootable/recovery" path="bootable/recovery" revision="f2914eacee9120680a41463708bb6ee8291749fc"/>
   <project name="platform/external/bluetooth/bluedroid" path="external/bluetooth/bluedroid" revision="81c4a859d75d413ad688067829d21b7ba9205f81"/>
   <project name="platform/external/bluetooth/bluez" path="external/bluetooth/bluez" revision="f0689ac1914cdbc59e53bdc9edd9013dc157c299"/>
   <project name="platform/external/bluetooth/glib" path="external/bluetooth/glib" revision="dd925f76e4f149c3d5571b80e12f7e24bbe89c59"/>
   <project name="platform/external/dbus" path="external/dbus" revision="ea87119c843116340f5df1d94eaf8275e1055ae8"/>
   <project name="platform/external/libnfc-nci" path="external/libnfc-nci" revision="494c177966fdc31183a5f7af82dc9130f523da4b"/>
@@ -139,9 +139,10 @@
   <project name="platform/hardware/qcom/media" path="hardware/qcom/media" revision="8a0d0b0d9889ef99c4c6317c810db4c09295f15a"/>
   <project name="platform/hardware/qcom/wlan" path="hardware/qcom/wlan" revision="2208fa3537ace873b8f9ec2355055761c79dfd5f"/>
   <project name="platform/hardware/ril" path="hardware/ril" revision="c4e2ac95907a5519a0e09f01a0d8e27fec101af0"/>
   <project name="platform/system/bluetooth" path="system/bluetooth" revision="e1eb226fa3ad3874ea7b63c56a9dc7012d7ff3c2"/>
   <project name="platform/system/core" path="system/core" revision="bbf7212289fc8311e43f9d11e10788e310d36a08"/>
   <project name="platform_system_nfcd" path="system/nfcd" remote="b2g" revision="d0aa65b140a45016975ed0ecf35f280dd336e1d3"/>
   <project name="platform/system/qcom" path="system/qcom" revision="1cdab258b15258b7f9657da70e6f06ebd5a2fc25"/>
   <project name="platform/vendor/qcom/msm8610" path="device/qcom/msm8610" revision="4ae5df252123591d5b941191790e7abed1bce5a4"/>
+  <project name="platform/vendor/qcom-opensource/wlan/prima" path="vendor/qcom/opensource/wlan/prima" revision="ce18b47b4a4f93a581d672bbd5cb6d12fe796ca9"/>
 </manifest>
--- a/b2g/config/gaia.json
+++ b/b2g/config/gaia.json
@@ -1,9 +1,9 @@
 {
     "git": {
         "git_revision": "", 
         "remote": "", 
         "branch": ""
     }, 
-    "revision": "16222b6246385cf793ae5fdced0ea6d548b7b949", 
+    "revision": "bca9de42a1157f1f90bf5a2cd791f17fb725fa7d", 
     "repo_path": "/integration/gaia-central"
 }
--- a/b2g/config/hamachi/sources.xml
+++ b/b2g/config/hamachi/sources.xml
@@ -12,17 +12,17 @@
   <!--original fetch url was git://github.com/apitrace/-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="b2g/ics_strawberry" sync-j="4"/>
   <!-- Gonk specific things and forks -->
   <project name="platform_build" path="build" remote="b2g" revision="2a165bebfa19b11b697837409f9550dd2917c46c">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0750f66a0004870773c9a743fa6bdbe124379336"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="b85f072304d7b3eead596100182fd1b1f1adc421"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="dbb66e540194a187326cece28ae0b51cdd500184"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="cabebb87fcd32f8596af08e6b5e80764ee0157dd"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
   <project name="platform/bionic" path="bionic" revision="d2eb6c7b6e1bc7643c17df2d9d9bcb1704d0b9ab"/>
--- a/b2g/config/helix/sources.xml
+++ b/b2g/config/helix/sources.xml
@@ -10,17 +10,17 @@
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <default remote="caf" revision="b2g/ics_strawberry" sync-j="4"/>
   <!-- Gonk specific things and forks -->
   <project name="platform_build" path="build" remote="b2g" revision="2a165bebfa19b11b697837409f9550dd2917c46c">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0750f66a0004870773c9a743fa6bdbe124379336"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="b85f072304d7b3eead596100182fd1b1f1adc421"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="dbb66e540194a187326cece28ae0b51cdd500184"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="gonk-patches" path="patches" remote="b2g" revision="223a2421006e8f5da33f516f6891c87cae86b0f6"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
   <project name="platform/bionic" path="bionic" revision="d2eb6c7b6e1bc7643c17df2d9d9bcb1704d0b9ab"/>
--- a/b2g/config/nexus-4/sources.xml
+++ b/b2g/config/nexus-4/sources.xml
@@ -12,17 +12,17 @@
   <!--original fetch url was https://git.mozilla.org/releases-->
   <remote fetch="https://git.mozilla.org/releases" name="mozillaorg"/>
   <!-- B2G specific things. -->
   <project name="platform_build" path="build" remote="b2g" revision="cc67f31dc638c0b7edba3cf7e3d87cadf0ed52bf">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="fake-libdvm" path="dalvik" remote="b2g" revision="d50ae982b19f42f0b66d08b9eb306be81687869f"/>
-  <project name="gaia" path="gaia" remote="mozillaorg" revision="0750f66a0004870773c9a743fa6bdbe124379336"/>
+  <project name="gaia" path="gaia" remote="mozillaorg" revision="b85f072304d7b3eead596100182fd1b1f1adc421"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="dbb66e540194a187326cece28ae0b51cdd500184"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="cabebb87fcd32f8596af08e6b5e80764ee0157dd"/>
   <project name="valgrind" path="external/valgrind" remote="b2g" revision="daa61633c32b9606f58799a3186395fd2bbb8d8c"/>
   <project name="vex" path="external/VEX" remote="b2g" revision="47f031c320888fe9f3e656602588565b52d43010"/>
   <!-- Stock Android things -->
   <project groups="linux" name="platform/prebuilts/clang/linux-x86/3.1" path="prebuilts/clang/linux-x86/3.1" revision="5c45f43419d5582949284eee9cef0c43d866e03b"/>
   <project groups="linux" name="platform/prebuilts/clang/linux-x86/3.2" path="prebuilts/clang/linux-x86/3.2" revision="3748b4168e7bd8d46457d4b6786003bc6a5223ce"/>
--- a/b2g/config/wasabi/sources.xml
+++ b/b2g/config/wasabi/sources.xml
@@ -12,17 +12,17 @@
   <!--original fetch url was git://github.com/apitrace/-->
   <remote fetch="https://git.mozilla.org/external/apitrace" name="apitrace"/>
   <default remote="caf" revision="ics_chocolate_rb4.2" sync-j="4"/>
   <!-- Gonk specific things and forks -->
   <project name="platform_build" path="build" remote="b2g" revision="2a165bebfa19b11b697837409f9550dd2917c46c">
     <copyfile dest="Makefile" src="core/root.mk"/>
   </project>
   <project name="fake-dalvik" path="dalvik" remote="b2g" revision="ca1f327d5acc198bb4be62fa51db2c039032c9ce"/>
-  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="0750f66a0004870773c9a743fa6bdbe124379336"/>
+  <project name="gaia.git" path="gaia" remote="mozillaorg" revision="b85f072304d7b3eead596100182fd1b1f1adc421"/>
   <project name="gonk-misc" path="gonk-misc" remote="b2g" revision="dbb66e540194a187326cece28ae0b51cdd500184"/>
   <project name="rilproxy" path="rilproxy" remote="b2g" revision="827214fcf38d6569aeb5c6d6f31cb296d1f09272"/>
   <project name="librecovery" path="librecovery" remote="b2g" revision="891e5069c0ad330d8191bf8c7b879c814258c89f"/>
   <project name="moztt" path="external/moztt" remote="b2g" revision="ce95d372e6d285725b96490afdaaf489ad8f9ca9"/>
   <project name="apitrace" path="external/apitrace" remote="apitrace" revision="cabebb87fcd32f8596af08e6b5e80764ee0157dd"/>
   <project name="gonk-patches" path="patches" remote="b2g" revision="223a2421006e8f5da33f516f6891c87cae86b0f6"/>
   <!-- Stock Android things -->
   <project name="platform/abi/cpp" path="abi/cpp" revision="6426040f1be4a844082c9769171ce7f5341a5528"/>
--- a/dom/cellbroadcast/interfaces/moz.build
+++ b/dom/cellbroadcast/interfaces/moz.build
@@ -1,14 +1,13 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
 XPIDL_SOURCES += [
     'nsICellBroadcastProvider.idl',
-    'nsIDOMMozCellBroadcastEvent.idl',
     'nsIDOMMozCellBroadcastMessage.idl',
 ]
 
 XPIDL_MODULE = 'dom_cellbroadcast'
 
deleted file mode 100644
--- a/dom/cellbroadcast/interfaces/nsIDOMMozCellBroadcastEvent.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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 "nsIDOMEvent.idl"
-
-interface nsIDOMMozCellBroadcastMessage;
-
-[scriptable, builtinclass, uuid(f955095f-01e4-4520-b299-7124ec7c63aa)]
-interface nsIDOMMozCellBroadcastEvent : nsIDOMEvent
-{
-  //[binaryname(MessageMoz)]
-  readonly attribute nsIDOMMozCellBroadcastMessage message;
-
-  [noscript] void initMozCellBroadcastEvent(in DOMString aType,
-                                            in boolean aCanBubble,
-                                            in boolean aCancelable,
-                                            in nsIDOMMozCellBroadcastMessage aMessage);
-};
--- a/dom/cellbroadcast/src/CellBroadcast.cpp
+++ b/dom/cellbroadcast/src/CellBroadcast.cpp
@@ -1,16 +1,16 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "CellBroadcast.h"
 #include "mozilla/dom/MozCellBroadcastBinding.h"
-#include "nsIDOMMozCellBroadcastEvent.h"
+#include "mozilla/dom/MozCellBroadcastEvent.h"
 #include "nsIDOMMozCellBroadcastMessage.h"
 #include "nsServiceManagerUtils.h"
 #include "GeneratedEvents.h"
 
 #define NS_RILCONTENTHELPER_CONTRACTID "@mozilla.org/ril/content-helper;1"
 
 using namespace mozilla::dom;
 
@@ -89,18 +89,17 @@ CellBroadcast::WrapObject(JSContext* aCx
   return MozCellBroadcastBinding::Wrap(aCx, this);
 }
 
 // Forwarded nsICellBroadcastListener methods
 
 NS_IMETHODIMP
 CellBroadcast::NotifyMessageReceived(nsIDOMMozCellBroadcastMessage* aMessage)
 {
-  nsCOMPtr<nsIDOMEvent> event;
-  NS_NewDOMMozCellBroadcastEvent(getter_AddRefs(event), this, nullptr, nullptr);
+  MozCellBroadcastEventInit init;
+  init.mBubbles = true;
+  init.mCancelable = false;
+  init.mMessage = aMessage;
 
-  nsCOMPtr<nsIDOMMozCellBroadcastEvent> ce = do_QueryInterface(event);
-  nsresult rv = ce->InitMozCellBroadcastEvent(NS_LITERAL_STRING("received"),
-                                              true, false, aMessage);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return DispatchTrustedEvent(ce);
+  nsRefPtr<MozCellBroadcastEvent> event =
+    MozCellBroadcastEvent::Constructor(this, NS_LITERAL_STRING("received"), init);
+  return DispatchTrustedEvent(event);
 }
--- a/dom/events/EventDispatcher.cpp
+++ b/dom/events/EventDispatcher.cpp
@@ -826,20 +826,16 @@ EventDispatcher::CreateEvent(EventTarget
     return NS_NewDOMCloseEvent(aDOMEvent, aOwner, aPresContext, nullptr);
   if (aEventType.LowerCaseEqualsLiteral("touchevent") &&
       TouchEvent::PrefEnabled())
     return NS_NewDOMTouchEvent(aDOMEvent, aOwner, aPresContext, nullptr);
   if (aEventType.LowerCaseEqualsLiteral("hashchangeevent"))
     return NS_NewDOMHashChangeEvent(aDOMEvent, aOwner, aPresContext, nullptr);
   if (aEventType.LowerCaseEqualsLiteral("customevent"))
     return NS_NewDOMCustomEvent(aDOMEvent, aOwner, aPresContext, nullptr);
-  if (aEventType.LowerCaseEqualsLiteral("mozsmsevent"))
-    return NS_NewDOMMozSmsEvent(aDOMEvent, aOwner, aPresContext, nullptr);
-  if (aEventType.LowerCaseEqualsLiteral("mozmmsevent"))
-    return NS_NewDOMMozMmsEvent(aDOMEvent, aOwner, aPresContext, nullptr);
   if (aEventType.LowerCaseEqualsLiteral("storageevent")) {
     return NS_NewDOMStorageEvent(aDOMEvent, aOwner);
   }
 
 
   // NEW EVENT TYPES SHOULD NOT BE ADDED HERE; THEY SHOULD USE ONLY EVENT
   // CONSTRUCTORS
 
--- a/dom/mobileconnection/tests/marionette/manifest.ini
+++ b/dom/mobileconnection/tests/marionette/manifest.ini
@@ -24,13 +24,15 @@ qemu = true
 [test_mobile_last_known_network.js]
 [test_mobile_icc_change.js]
 [test_mobile_connections_array_uninitialized.js]
 [test_mobile_signal_strength.js]
 [test_mobile_data_ipv6.js]
 disabled = Bug 979137
 [test_mobile_supported_network_types.js]
 [test_mobile_call_forwarding_set.js]
+disabled = Bug 861725
 [test_mobile_call_forwarding_get.js]
+disabled = Bug 861725
 [test_mobile_voice_privacy.js]
 [test_dsds_mobile_data_connection.js]
 [test_mobile_clir.js]
 [test_mobile_clir_radio_off.js]
--- a/dom/mobilemessage/interfaces/moz.build
+++ b/dom/mobilemessage/interfaces/moz.build
@@ -1,20 +1,18 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
 XPIDL_SOURCES += [
     'nsIDOMMobileMessageManager.idl',
-    'nsIDOMMozMmsEvent.idl',
     'nsIDOMMozMmsMessage.idl',
     'nsIDOMMozMobileMessageThread.idl',
-    'nsIDOMMozSmsEvent.idl',
     'nsIDOMMozSmsMessage.idl',
     'nsIDOMSmsFilter.idl',
     'nsIDOMSmsSegmentInfo.idl',
     'nsIMmsService.idl',
     'nsIMobileMessageCallback.idl',
     'nsIMobileMessageCursorCallback.idl',
     'nsIMobileMessageDatabaseService.idl',
     'nsIMobileMessageService.idl',
deleted file mode 100644
--- a/dom/mobilemessage/interfaces/nsIDOMMozMmsEvent.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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 "nsIDOMEvent.idl"
-
-interface nsIDOMMozMmsMessage;
-
-[builtinclass, uuid(b33cc0f2-8886-11e2-9433-eff9a8af9a70)]
-interface nsIDOMMozMmsEvent : nsIDOMEvent
-{
-  readonly attribute nsIDOMMozMmsMessage message;
-
-  [noscript] void initMozMmsEvent(in DOMString aType,
-                                  in boolean aCanBubble,
-                                  in boolean aCancelable,
-                                  in nsIDOMMozMmsMessage aMessage);
-};
deleted file mode 100644
--- a/dom/mobilemessage/interfaces/nsIDOMMozSmsEvent.idl
+++ /dev/null
@@ -1,18 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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 "nsIDOMEvent.idl"
-
-interface nsIDOMMozSmsMessage;
-
-[builtinclass, uuid(f12f9208-0abd-4d95-9a27-93a74b5e47a2)]
-interface nsIDOMMozSmsEvent : nsIDOMEvent
-{
-  readonly attribute nsIDOMMozSmsMessage message;
-
-  [noscript] void initMozSmsEvent(in DOMString aType,
-                                  in boolean aCanBubble,
-                                  in boolean aCancelable,
-                                  in nsIDOMMozSmsMessage aMessage);
-};
--- a/dom/mobilemessage/src/MobileMessageManager.cpp
+++ b/dom/mobilemessage/src/MobileMessageManager.cpp
@@ -8,19 +8,19 @@
 #include "nsIDOMClassInfo.h"
 #include "nsISmsService.h"
 #include "nsIMmsService.h"
 #include "nsIObserverService.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
 #include "mozilla/dom/mobilemessage/Constants.h" // For MessageType
 #include "mozilla/dom/MobileMessageManagerBinding.h"
+#include "mozilla/dom/MozMmsEvent.h"
 #include "mozilla/dom/MozMmsMessageBinding.h"
-#include "nsIDOMMozSmsEvent.h"
-#include "nsIDOMMozMmsEvent.h"
+#include "mozilla/dom/MozSmsEvent.h"
 #include "nsIDOMMozSmsMessage.h"
 #include "nsIDOMMozMmsMessage.h"
 #include "nsJSUtils.h"
 #include "nsContentUtils.h"
 #include "nsCxPusher.h"
 #include "nsIMobileMessageDatabaseService.h"
 #include "nsIXPConnect.h"
 #include "nsIPermissionManager.h"
@@ -471,37 +471,37 @@ MobileMessageManager::RetrieveMMS(int32_
     return NS_OK;
 }
 
 nsresult
 MobileMessageManager::DispatchTrustedSmsEventToSelf(const char* aTopic,
                                                     const nsAString& aEventName,
                                                     nsISupports* aMsg)
 {
-  nsCOMPtr<nsIDOMEvent> event;
-
   nsCOMPtr<nsIDOMMozSmsMessage> sms = do_QueryInterface(aMsg);
   if (sms) {
-    NS_NewDOMMozSmsEvent(getter_AddRefs(event), this, nullptr, nullptr);
-    NS_ASSERTION(event, "This should never fail!");
+    MozSmsEventInit init;
+    init.mBubbles = false;
+    init.mCancelable = false;
+    init.mMessage = sms;
 
-    nsCOMPtr<nsIDOMMozSmsEvent> se = do_QueryInterface(event);
-    nsresult rv = se->InitMozSmsEvent(aEventName, false, false, sms);
-    NS_ENSURE_SUCCESS(rv, rv);
+    nsRefPtr<MozSmsEvent> event =
+      MozSmsEvent::Constructor(this, aEventName, init);
     return DispatchTrustedEvent(event);
   }
 
   nsCOMPtr<nsIDOMMozMmsMessage> mms = do_QueryInterface(aMsg);
   if (mms) {
-    NS_NewDOMMozMmsEvent(getter_AddRefs(event), this, nullptr, nullptr);
-    NS_ASSERTION(event, "This should never fail!");
+    MozMmsEventInit init;
+    init.mBubbles = false;
+    init.mCancelable = false;
+    init.mMessage = mms;
 
-    nsCOMPtr<nsIDOMMozMmsEvent> se = do_QueryInterface(event);
-    nsresult rv = se->InitMozMmsEvent(aEventName, false, false, mms);
-    NS_ENSURE_SUCCESS(rv, rv);
+    nsRefPtr<MozMmsEvent> event =
+      MozMmsEvent::Constructor(this, aEventName, init);
     return DispatchTrustedEvent(event);
   }
 
   nsAutoCString errorMsg;
   errorMsg.AssignLiteral("Got a '");
   errorMsg.Append(aTopic);
   errorMsg.AppendLiteral("' topic without a valid message!");
   NS_ERROR(errorMsg.get());
deleted file mode 100644
--- a/dom/telephony/CallEvent.cpp
+++ /dev/null
@@ -1,73 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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 "CallEvent.h"
-#include "mozilla/dom/CallEventBinding.h"
-
-#include "TelephonyCall.h"
-
-using namespace mozilla::dom;
-using mozilla::ErrorResult;
-
-/* static */
-already_AddRefed<CallEvent>
-CallEvent::Create(EventTarget* aOwner, const nsAString& aType,
-                  TelephonyCall* aCall, bool aCanBubble,
-                  bool aCancelable)
-{
-  nsRefPtr<CallEvent> event = new CallEvent(aOwner, nullptr, nullptr);
-  event->mCall = aCall;
-  event->InitEvent(aType, aCanBubble, aCancelable);
-  return event.forget();
-}
-
-JSObject*
-CallEvent::WrapObject(JSContext* aCx)
-{
-  return CallEventBinding::Wrap(aCx, this);
-}
-
-NS_IMPL_CYCLE_COLLECTION_CLASS(CallEvent)
-
-NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(CallEvent, Event)
-  NS_IMPL_CYCLE_COLLECTION_UNLINK(mCall)
-NS_IMPL_CYCLE_COLLECTION_UNLINK_END
-
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(CallEvent, Event)
-  NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mCall)
-NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
-
-NS_IMPL_ADDREF_INHERITED(CallEvent, Event)
-NS_IMPL_RELEASE_INHERITED(CallEvent, Event)
-
-NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(CallEvent)
-NS_INTERFACE_MAP_END_INHERITING(Event)
-
-// WebIDL
-
-/* static */
-already_AddRefed<CallEvent>
-CallEvent::Constructor(const GlobalObject& aGlobal, const nsAString& aType,
-                       const CallEventInit& aOptions, ErrorResult& aRv)
-{
-  nsCOMPtr<EventTarget> target = do_QueryInterface(aGlobal.GetAsSupports());
-
-  if (!target) {
-    aRv.Throw(NS_ERROR_UNEXPECTED);
-    return nullptr;
-  }
-
-  nsRefPtr<CallEvent> event = Create(target, aType, aOptions.mCall, false, false);
-
-  return event.forget();
-}
-
-already_AddRefed<TelephonyCall>
-CallEvent::GetCall() const
-{
-  nsRefPtr<TelephonyCall> call = mCall;
-  return call.forget();
-}
deleted file mode 100644
--- a/dom/telephony/CallEvent.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set ts=8 sts=2 et sw=2 tw=80: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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/. */
-
-#ifndef mozilla_dom_telephony_callevent_h
-#define mozilla_dom_telephony_callevent_h
-
-#include "mozilla/dom/Event.h"
-#include "mozilla/dom/telephony/TelephonyCommon.h"
-
-namespace mozilla {
-namespace dom {
-
-struct CallEventInit;
-
-class CallEvent MOZ_FINAL : public Event
-{
-  nsRefPtr<TelephonyCall> mCall;
-
-public:
-  NS_DECL_ISUPPORTS_INHERITED
-  NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(CallEvent, Event)
-  NS_FORWARD_TO_EVENT
-
-  virtual JSObject*
-  WrapObject(JSContext* aCx) MOZ_OVERRIDE;
-
-  // WebIDL
-  static already_AddRefed<CallEvent>
-  Constructor(const GlobalObject& aGlobal, const nsAString& aType,
-              const CallEventInit& aOptions, ErrorResult& aRv);
-
-  already_AddRefed<TelephonyCall>
-  GetCall() const;
-
-  static already_AddRefed<CallEvent>
-  Create(EventTarget* aOwner, const nsAString& aType, TelephonyCall* aCall,
-         bool aCanBubble, bool aCancelable);
-
-private:
-  CallEvent(EventTarget* aOwner,
-            nsPresContext* aPresContext,
-            WidgetEvent* aEvent)
-    : Event(aOwner, aPresContext, aEvent)
-  {
-    SetIsDOMBinding();
-  }
-
-  virtual ~CallEvent()
-  { }
-};
-
-} // namespace dom
-} // namespace mozilla
-
-#endif // mozilla_dom_telephony_callevent_h
--- a/dom/telephony/Telephony.cpp
+++ b/dom/telephony/Telephony.cpp
@@ -1,32 +1,32 @@
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "Telephony.h"
+#include "mozilla/dom/CallEvent.h"
 #include "mozilla/dom/TelephonyBinding.h"
 #include "mozilla/dom/Promise.h"
 
 #include "nsIURI.h"
 #include "nsPIDOMWindow.h"
 #include "nsIPermissionManager.h"
 
 #include "mozilla/dom/UnionTypes.h"
 #include "mozilla/Preferences.h"
 #include "nsCharSeparatedTokenizer.h"
 #include "nsContentUtils.h"
 #include "nsCxPusher.h"
 #include "nsNetUtil.h"
 #include "nsServiceManagerUtils.h"
 #include "nsThreadUtils.h"
 
-#include "CallEvent.h"
 #include "CallsList.h"
 #include "TelephonyCall.h"
 #include "TelephonyCallGroup.h"
 
 using namespace mozilla::dom;
 using mozilla::ErrorResult;
 
 class Telephony::Listener : public nsITelephonyListener
@@ -687,17 +687,22 @@ Telephony::DispatchCallEvent(const nsASt
   // The call may be null in following cases:
   //   1. callschanged when notifying enumeration being completed
   //   2. remoteheld/remoteresumed.
   MOZ_ASSERT(aCall ||
              aType.EqualsLiteral("callschanged") ||
              aType.EqualsLiteral("remoteheld") ||
              aType.EqualsLiteral("remtoeresumed"));
 
-  nsRefPtr<CallEvent> event = CallEvent::Create(this, aType, aCall, false, false);
+  CallEventInit init;
+  init.mBubbles = false;
+  init.mCancelable = false;
+  init.mCall = aCall;
+
+  nsRefPtr<CallEvent> event = CallEvent::Constructor(this, aType, init);
 
   return DispatchTrustedEvent(event);
 }
 
 void
 Telephony::EnqueueEnumerationAck()
 {
   if (!mEnumerated) {
--- a/dom/telephony/TelephonyCall.cpp
+++ b/dom/telephony/TelephonyCall.cpp
@@ -1,20 +1,20 @@
 /* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
 /* vim: set ts=2 et sw=2 tw=40: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "TelephonyCall.h"
+#include "mozilla/dom/CallEvent.h"
 #include "mozilla/dom/TelephonyCallBinding.h"
 
 #include "mozilla/dom/DOMError.h"
 
-#include "CallEvent.h"
 #include "Telephony.h"
 #include "TelephonyCallGroup.h"
 
 using namespace mozilla::dom;
 using mozilla::ErrorResult;
 
 // static
 already_AddRefed<TelephonyCall>
@@ -140,17 +140,22 @@ TelephonyCall::ChangeStateInternal(uint1
 }
 
 nsresult
 TelephonyCall::DispatchCallEvent(const nsAString& aType,
                                  TelephonyCall* aCall)
 {
   MOZ_ASSERT(aCall);
 
-  nsRefPtr<CallEvent> event = CallEvent::Create(this, aType, aCall, false, false);
+  CallEventInit init;
+  init.mBubbles = false;
+  init.mCancelable = false;
+  init.mCall = aCall;
+
+  nsRefPtr<CallEvent> event = CallEvent::Constructor(this, aType, init);
 
   return DispatchTrustedEvent(event);
 }
 
 void
 TelephonyCall::NotifyError(const nsAString& aError)
 {
   // Set the error string
--- a/dom/telephony/TelephonyCallGroup.cpp
+++ b/dom/telephony/TelephonyCallGroup.cpp
@@ -2,18 +2,18 @@
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "TelephonyCallGroup.h"
 #include "mozilla/dom/TelephonyCallGroupBinding.h"
 
-#include "CallEvent.h"
 #include "CallsList.h"
+#include "mozilla/dom/CallEvent.h"
 #include "mozilla/dom/CallGroupErrorEvent.h"
 #include "Telephony.h"
 
 using namespace mozilla::dom;
 using mozilla::ErrorResult;
 
 TelephonyCallGroup::TelephonyCallGroup(nsPIDOMWindow* aOwner)
   : DOMEventTargetHelper(aOwner)
@@ -137,17 +137,22 @@ TelephonyCallGroup::NotifyCallsChanged(T
 {
   return DispatchCallEvent(NS_LITERAL_STRING("callschanged"), aCall);
 }
 
 nsresult
 TelephonyCallGroup::DispatchCallEvent(const nsAString& aType,
                                       TelephonyCall* aCall)
 {
-  nsRefPtr<CallEvent> event = CallEvent::Create(this, aType, aCall, false, false);
+  CallEventInit init;
+  init.mBubbles = false;
+  init.mCancelable = false;
+  init.mCall = aCall;
+
+  nsRefPtr<CallEvent> event = CallEvent::Constructor(this, aType, init);
   return DispatchTrustedEvent(event);
 }
 
 bool
 TelephonyCallGroup::CanConference(const TelephonyCall& aCall,
                                   TelephonyCall* aSecondCall)
 {
   if (!aCall.Mergeable()) {
--- a/dom/telephony/moz.build
+++ b/dom/telephony/moz.build
@@ -6,32 +6,30 @@
 
 XPIDL_SOURCES += [
     'nsITelephonyService.idl',
 ]
 
 XPIDL_MODULE = 'dom_telephony'
 
 EXPORTS.mozilla.dom += [
-    'CallEvent.h',
     'CallsList.h',
     'Telephony.h',
     'TelephonyCall.h',
     'TelephonyCallGroup.h',
 ]
 
 EXPORTS.mozilla.dom.telephony += [
     'ipc/TelephonyChild.h',
     'ipc/TelephonyParent.h',
     'TelephonyCommon.h',
     'TelephonyFactory.h',
 ]
 
 UNIFIED_SOURCES += [
-    'CallEvent.cpp',
     'CallsList.cpp',
     'ipc/TelephonyChild.cpp',
     'ipc/TelephonyIPCService.cpp',
     'ipc/TelephonyParent.cpp',
     'Telephony.cpp',
     'TelephonyCall.cpp',
     'TelephonyCallGroup.cpp',
     'TelephonyFactory.cpp',
--- a/dom/voicemail/Voicemail.cpp
+++ b/dom/voicemail/Voicemail.cpp
@@ -2,18 +2,18 @@
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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 "Voicemail.h"
 
 #include "mozilla/dom/MozVoicemailBinding.h"
+#include "mozilla/dom/MozVoicemailEvent.h"
 #include "nsIDOMMozVoicemailStatus.h"
-#include "nsIDOMMozVoicemailEvent.h"
 
 #include "mozilla/Preferences.h"
 #include "mozilla/Services.h"
 #include "nsDOMClassInfo.h"
 #include "nsServiceManagerUtils.h"
 #include "GeneratedEvents.h"
 
 #define NS_RILCONTENTHELPER_CONTRACTID "@mozilla.org/ril/content-helper;1"
@@ -159,25 +159,24 @@ Voicemail::GetDisplayName(const Optional
   aRv = mProvider->GetVoicemailDisplayName(id, aDisplayName);
 }
 
 // nsIVoicemailListener
 
 NS_IMETHODIMP
 Voicemail::NotifyStatusChanged(nsIDOMMozVoicemailStatus* aStatus)
 {
-  nsCOMPtr<nsIDOMEvent> event;
-  NS_NewDOMMozVoicemailEvent(getter_AddRefs(event), this, nullptr, nullptr);
+  MozVoicemailEventInit init;
+  init.mBubbles = false;
+  init.mCancelable = false;
+  init.mStatus = aStatus;
 
-  nsCOMPtr<nsIDOMMozVoicemailEvent> ce = do_QueryInterface(event);
-  nsresult rv = ce->InitMozVoicemailEvent(NS_LITERAL_STRING("statuschanged"),
-                                          false, false, aStatus);
-  NS_ENSURE_SUCCESS(rv, rv);
-
-  return DispatchTrustedEvent(ce);
+  nsRefPtr<MozVoicemailEvent> event =
+    MozVoicemailEvent::Constructor(this, NS_LITERAL_STRING("statuschanged"), init);
+  return DispatchTrustedEvent(event);
 }
 
 nsresult
 NS_NewVoicemail(nsPIDOMWindow* aWindow, Voicemail** aVoicemail)
 {
   nsPIDOMWindow* innerWindow = aWindow->IsInnerWindow() ?
     aWindow :
     aWindow->GetCurrentInnerWindow();
--- a/dom/voicemail/moz.build
+++ b/dom/voicemail/moz.build
@@ -1,16 +1,15 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
 XPIDL_SOURCES += [
-    'nsIDOMMozVoicemailEvent.idl',
     'nsIDOMMozVoicemailStatus.idl',
     'nsIVoicemailProvider.idl',
 ]
 
 XPIDL_MODULE = 'dom_voicemail'
 
 EXPORTS.mozilla.dom += [
     'Voicemail.h',
deleted file mode 100644
--- a/dom/voicemail/nsIDOMMozVoicemailEvent.idl
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- Mode: c++; c-basic-offset: 2; indent-tabs-mode: nil; tab-width: 40 -*- */
-/* vim: set ts=2 et sw=2 tw=40: */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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 "nsIDOMEvent.idl"
-
-interface nsIDOMMozVoicemailStatus;
-
-[builtinclass, uuid(63e42e5f-0742-4c8f-bd52-938a7e03d2c9)]
-interface nsIDOMMozVoicemailEvent : nsIDOMEvent
-{
-  /**
-   * The voicemail status that caused this event to fire
-   */
-  readonly attribute nsIDOMMozVoicemailStatus status;
-
-  [noscript] void initMozVoicemailEvent(in DOMString aType,
-                                        in boolean aCanBubble,
-                                        in boolean aCancelable,
-                                        in nsIDOMMozVoicemailStatus aStatus);
-};
--- a/dom/webidl/MozCellBroadcastEvent.webidl
+++ b/dom/webidl/MozCellBroadcastEvent.webidl
@@ -1,16 +1,16 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/.
  */
 interface MozCellBroadcastMessage;
 
-[Constructor(DOMString type, optional MozCellBroadcastEventInit eventInitDict), HeaderFile="GeneratedEventClasses.h", Pref="dom.cellbroadcast.enabled"]
+[Constructor(DOMString type, optional MozCellBroadcastEventInit eventInitDict), Pref="dom.cellbroadcast.enabled"]
 interface MozCellBroadcastEvent : Event
 {
   readonly attribute MozCellBroadcastMessage? message;
 };
 
 dictionary MozCellBroadcastEventInit : EventInit
 {
   MozCellBroadcastMessage? message = null;
--- a/dom/webidl/MozMmsEvent.webidl
+++ b/dom/webidl/MozMmsEvent.webidl
@@ -1,16 +1,16 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/.
  */
 interface MozMmsMessage;
 
-[Constructor(DOMString type, optional MozMmsEventInit eventInitDict), HeaderFile="GeneratedEventClasses.h"]
+[Constructor(DOMString type, optional MozMmsEventInit eventInitDict)]
 interface MozMmsEvent : Event
 {
   readonly attribute MozMmsMessage? message;
 };
 
 dictionary MozMmsEventInit : EventInit
 {
   MozMmsMessage? message = null;
--- a/dom/webidl/MozSmsEvent.webidl
+++ b/dom/webidl/MozSmsEvent.webidl
@@ -1,16 +1,16 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/.
  */
 interface MozSmsMessage;
 
-[Constructor(DOMString type, optional MozSmsEventInit eventInitDict), HeaderFile="GeneratedEventClasses.h"]
+[Constructor(DOMString type, optional MozSmsEventInit eventInitDict)]
 interface MozSmsEvent : Event
 {
   readonly attribute MozSmsMessage? message;
 };
 
 dictionary MozSmsEventInit : EventInit
 {
   MozSmsMessage? message = null;
--- a/dom/webidl/MozVoicemailEvent.webidl
+++ b/dom/webidl/MozVoicemailEvent.webidl
@@ -1,16 +1,16 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/.
  */
 interface MozVoicemailStatus;
 
-[Constructor(DOMString type, optional MozVoicemailEventInit eventInitDict), HeaderFile="GeneratedEventClasses.h", Pref="dom.voicemail.enabled"]
+[Constructor(DOMString type, optional MozVoicemailEventInit eventInitDict), Pref="dom.voicemail.enabled"]
 interface MozVoicemailEvent : Event
 {
   readonly attribute MozVoicemailStatus? status;
 };
 
 dictionary MozVoicemailEventInit : EventInit
 {
   MozVoicemailStatus? status = null;
--- a/dom/webidl/MozWifiConnectionInfoEvent.webidl
+++ b/dom/webidl/MozWifiConnectionInfoEvent.webidl
@@ -1,22 +1,40 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/.
  */
 
-[Constructor(DOMString type, optional MozWifiConnectionInfoEventInit eventInitDict), HeaderFile="GeneratedEventClasses.h"]
+[Constructor(DOMString type, optional MozWifiConnectionInfoEventInit eventInitDict)]
 interface MozWifiConnectionInfoEvent : Event
 {
-  [Throws]
+  /**
+   * Network object with an SSID field.
+   */
   readonly attribute any network;
+
+  /**
+   * Strength of the signal to network, in dBm between -55 and -100 dBm.
+   */
   readonly attribute short signalStrength;
+
+  /**
+   * Relative signal strength between 0 and 100.
+   */
   readonly attribute short relSignalStrength;
+
+  /**
+   * Link speed in Mb/s.
+   */
   readonly attribute long linkSpeed;
+
+  /**
+   * IP address in the dotted quad format.
+   */
   readonly attribute DOMString? ipAddress;
 };
 
 dictionary MozWifiConnectionInfoEventInit : EventInit
 {
   any network = null;
   short signalStrength = 0;
   short relSignalStrength = 0;
--- a/dom/webidl/MozWifiManager.webidl
+++ b/dom/webidl/MozWifiManager.webidl
@@ -276,30 +276,30 @@ interface MozWifiManager : EventTarget {
    *
    *  Note that the object returned is read only. Any changes required must
    *  be done by calling other APIs.
    */
   readonly attribute MozWifiConnection connection;
 
   /**
    * A connectionInformation object with the same information found in an
-   * nsIDOMMozWifiConnectionInfoEvent (but without the network).
+   * MozWifiConnectionInfoEvent (but without the network).
    * If we are not currently connected to a network, this will be null.
    */
   readonly attribute MozWifiConnectionInfo? connectionInformation;
 
   /**
    * Capabilities of Wifi.
    */
   readonly attribute MozWifiCapabilities? capabilities;
 
   /**
    * State notification listeners. These all take an
-   * nsIDOMMozWifiStatusChangeEvent with the new status and a network (which
-   * may be null).
+   * MozWifiStatusChangeEvent with the new status and a network (which may be
+   * null).
    *
    * The possible statuses are:
    *   - connecting: Fires when we start the process of connecting to a
    *                 network.
    *   - associated: Fires when we have connected to an access point but do
    *                 not yet have an IP address.
    *   - connected: Fires once we are fully connected to an access point and
    *                can access the internet.
--- a/dom/webidl/MozWifiP2pStatusChangeEvent.webidl
+++ b/dom/webidl/MozWifiP2pStatusChangeEvent.webidl
@@ -1,18 +1,20 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/.
  */
 
 [Constructor(DOMString type, optional MozWifiP2pStatusChangeEventInit eventInitDict), 
- HeaderFile="GeneratedEventClasses.h",
  Func="Navigator::HasWifiManagerSupport"]
 interface MozWifiP2pStatusChangeEvent : Event
 {
+  /**
+   * The mac address of the peer whose status has just changed.
+   */
   readonly attribute DOMString peerAddress;
 };
 
 dictionary MozWifiP2pStatusChangeEventInit : EventInit
 {
   DOMString peerAddress = "";
 };
--- a/dom/webidl/MozWifiStationInfoEvent.webidl
+++ b/dom/webidl/MozWifiStationInfoEvent.webidl
@@ -1,15 +1,15 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/.
  */
 
-[Constructor(DOMString type, optional MozWifiStationInfoEventInit eventInitDict), HeaderFile="GeneratedEventClasses.h"]
+[Constructor(DOMString type, optional MozWifiStationInfoEventInit eventInitDict)]
 interface MozWifiStationInfoEvent : Event
 {
   /**
    * The number of wifi stations connected to wifi hotspot.
    */
   readonly attribute short station;
 };
 
--- a/dom/webidl/MozWifiStatusChangeEvent.webidl
+++ b/dom/webidl/MozWifiStatusChangeEvent.webidl
@@ -1,19 +1,27 @@
 /* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * 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/.
  */
 
-[Constructor(DOMString type, optional MozWifiStatusChangeEventInit eventInitDict), HeaderFile="GeneratedEventClasses.h"]
+[Constructor(DOMString type, optional MozWifiStatusChangeEventInit eventInitDict)]
 interface MozWifiStatusChangeEvent : Event
 {
-  [Throws]
+  /**
+   * Network object with a SSID field describing the network affected by
+   * this change. This might be null.
+   */
   readonly attribute any network;
+
+  /**
+   * String describing the current status of the wifi manager. See above for
+   * the possible values.
+   */
   readonly attribute DOMString? status;
 };
 
 dictionary MozWifiStatusChangeEventInit : EventInit
 {
   any network = null;
   DOMString status = "";
 };
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -37,17 +37,16 @@ WEBIDL_FILES = [
     'AudioProcessingEvent.webidl',
     'AudioStreamTrack.webidl',
     'BarProp.webidl',
     'BatteryManager.webidl',
     'BeforeUnloadEvent.webidl',
     'BiquadFilterNode.webidl',
     'Blob.webidl',
     'BrowserElementDictionaries.webidl',
-    'CallEvent.webidl',
     'CallsList.webidl',
     'CameraCapabilities.webidl',
     'CameraControl.webidl',
     'CameraManager.webidl',
     'CanvasRenderingContext2D.webidl',
     'CaretPosition.webidl',
     'CDATASection.webidl',
     'ChannelMergerNode.webidl',
@@ -528,19 +527,17 @@ WEBIDL_FILES += [
     'CloseEvent.webidl',
     'CustomEvent.webidl',
     'DeviceOrientationEvent.webidl',
     'DeviceStorageChangeEvent.webidl',
     'DOMTransactionEvent.webidl',
     'ElementReplaceEvent.webidl',
     'HashChangeEvent.webidl',
     'MozApplicationEvent.webidl',
-    'MozMmsEvent.webidl',
     'MozSettingsEvent.webidl',
-    'MozSmsEvent.webidl',
     'PageTransitionEvent.webidl',
     'PopStateEvent.webidl',
     'PopupBlockedEvent.webidl',
     'ProgressEvent.webidl',
     'RecordErrorEvent.webidl',
     'SmartCardEvent.webidl',
     'StyleRuleChangeEvent.webidl',
     'StyleSheetApplicableStateChangeEvent.webidl',
@@ -566,26 +563,24 @@ if CONFIG['MOZ_B2G_BT']:
             'BluetoothManager.webidl',
         ]
 
 if CONFIG['MOZ_B2G_RIL']:
     WEBIDL_FILES += [
         'DOMMMIError.webidl',
         'IccCardLockError.webidl',
         'MozCellBroadcast.webidl',
-        'MozCellBroadcastEvent.webidl',
         'MozIcc.webidl',
         'MozIccManager.webidl',
         'MozMobileCellInfo.webidl',
         'MozMobileConnection.webidl',
         'MozMobileConnectionArray.webidl',
         'MozMobileConnectionInfo.webidl',
         'MozMobileNetworkInfo.webidl',
         'MozVoicemail.webidl',
-        'MozVoicemailEvent.webidl',
     ]
 
 if CONFIG['MOZ_NFC']:
     WEBIDL_FILES += [
          'MozNDEFRecord.webidl',
          'MozNFC.webidl',
          'MozNFCPeer.webidl',
          'MozNFCTag.webidl',
@@ -594,22 +589,18 @@ if CONFIG['MOZ_NFC']:
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     WEBIDL_FILES += [
         'MozNetworkStats.webidl',
         'MozNetworkStatsAlarm.webidl',
         'MozNetworkStatsData.webidl',
         'MozNetworkStatsInterface.webidl',
         'MozSpeakerManager.webidl',
         'MozWifiCapabilities.webidl',
-        'MozWifiConnectionInfoEvent.webidl',
         'MozWifiManager.webidl',
         'MozWifiP2pManager.webidl',
-        'MozWifiP2pStatusChangeEvent.webidl',
-        'MozWifiStationInfoEvent.webidl',
-        'MozWifiStatusChangeEvent.webidl',
     ]
 else:
     WEBIDL_FILES += [
         'InstallTrigger.webidl',
     ]
 
 if CONFIG['MOZ_WEBSPEECH']:
     WEBIDL_FILES += [
@@ -625,31 +616,34 @@ if CONFIG['MOZ_B2G_FM']:
 if not CONFIG['MOZ_DISABLE_CRYPTOLEGACY']:
     WEBIDL_FILES += [
         'CRMFObject.webidl',
     ]
 
 GENERATED_EVENTS_WEBIDL_FILES = [
     'AutocompleteErrorEvent.webidl',
     'BlobEvent.webidl',
+    'CallEvent.webidl',
     'CallGroupErrorEvent.webidl',
     'CFStateChangeEvent.webidl',
     'DataErrorEvent.webidl',
     'DataStoreChangeEvent.webidl',
     'DeviceLightEvent.webidl',
     'DeviceProximityEvent.webidl',
     'DownloadEvent.webidl',
     'ErrorEvent.webidl',
     'IccChangeEvent.webidl',
     'MediaStreamEvent.webidl',
     'MozClirModeEvent.webidl',
     'MozContactChangeEvent.webidl',
     'MozEmergencyCbModeEvent.webidl',
     'MozInterAppMessageEvent.webidl',
+    'MozMmsEvent.webidl',
     'MozOtaStatusEvent.webidl',
+    'MozSmsEvent.webidl',
     'MozStkCommandEvent.webidl',
     'ProgressEvent.webidl',
     'RTCDataChannelEvent.webidl',
     'RTCPeerConnectionIceEvent.webidl',
     'RTCPeerConnectionIdentityErrorEvent.webidl',
     'RTCPeerConnectionIdentityEvent.webidl',
     'TrackEvent.webidl',
     'UserProximityEvent.webidl',
@@ -674,16 +668,30 @@ if CONFIG['MOZ_B2G_BT']:
             'BluetoothDiscoveryStateChangedEvent.webidl',
         ]
 
     GENERATED_EVENTS_WEBIDL_FILES += [
         'BluetoothDeviceEvent.webidl',
         'BluetoothStatusChangedEvent.webidl',
     ]
 
+if CONFIG['MOZ_B2G_RIL']:
+    GENERATED_EVENTS_WEBIDL_FILES += [
+        'MozCellBroadcastEvent.webidl',
+        'MozVoicemailEvent.webidl',
+    ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
+    GENERATED_EVENTS_WEBIDL_FILES += [
+        'MozWifiConnectionInfoEvent.webidl',
+        'MozWifiP2pStatusChangeEvent.webidl',
+        'MozWifiStationInfoEvent.webidl',
+        'MozWifiStatusChangeEvent.webidl',
+    ]
+
 if CONFIG['MOZ_BUILD_APP'] in ['browser', 'xulrunner']:
     WEBIDL_FILES += [
         'BrowserFeedWriter.webidl',
     ]
 
 if CONFIG['MOZ_BUILD_APP'] in ['browser', 'mobile/android', 'xulrunner']:
     WEBIDL_FILES += [
         'External.webidl',
--- a/dom/wifi/moz.build
+++ b/dom/wifi/moz.build
@@ -1,19 +1,15 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # 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/.
 
 XPIDL_SOURCES += [
-    'nsIDOMMozWifiConnectionInfoEvent.idl',
-    'nsIDOMMozWifiP2pStatusChangeEvent.idl',
-    'nsIDOMMozWifiStationInfoEvent.idl',
-    'nsIDOMMozWifiStatusChangeEvent.idl',
     'nsIWifi.idl',
     'nsIWifiCertService.idl',
     'nsIWifiService.idl',
 ]
 
 XPIDL_MODULE = 'dom_wifi'
 
 EXTRA_COMPONENTS += [
deleted file mode 100644
--- a/dom/wifi/nsIDOMMozWifiConnectionInfoEvent.idl
+++ /dev/null
@@ -1,45 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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 "nsIDOMEvent.idl"
-
-interface nsIVariant;
-
-[builtinclass, uuid(627b2102-9605-40e0-a5bf-6d3ac672b328)]
-interface nsIDOMMozWifiConnectionInfoEvent : nsIDOMEvent
-{
-    /**
-     * Network object with an SSID field.
-     */
-    readonly attribute nsIVariant network;
-
-    /**
-     * Strength of the signal to network, in dBm between -55 and -100 dBm.
-     */
-    readonly attribute short signalStrength;
-
-    /**
-     * Relative signal strength between 0 and 100.
-     */
-    readonly attribute short relSignalStrength;
-
-    /**
-     * Link speed in Mb/s.
-     */
-    readonly attribute long linkSpeed;
-
-    /**
-     * IP address in the dotted quad format.
-     */
-    readonly attribute DOMString ipAddress;
-
-    [noscript] void initMozWifiConnectionInfoEvent(in DOMString aType,
-                                                   in boolean aCanBubble,
-                                                   in boolean aCancelable,
-                                                   in nsIVariant aNetwork,
-                                                   in short signalStrength,
-                                                   in short relSignalStrength,
-                                                   in long linkSpeed,
-                                                   in DOMString ipAddress);
-};
deleted file mode 100644
--- a/dom/wifi/nsIDOMMozWifiP2pStatusChangeEvent.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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 "nsIDOMEvent.idl"
-
-[builtinclass, uuid(82cad910-2019-11e3-8224-0800200c9a66)]
-interface nsIDOMMozWifiP2pStatusChangeEvent : nsIDOMEvent
-{
-  /**
-   * The mac address of the peer whose status has just changed.
-   */
-  readonly attribute DOMString peerAddress;
-
-  [noscript] void initMozWifiP2pStatusChangeEvent(in DOMString aType,
-                                                  in boolean aCanBubble,
-                                                  in boolean aCancelable,
-                                                  in DOMString aPeerAddress);
-};
deleted file mode 100644
--- a/dom/wifi/nsIDOMMozWifiStationInfoEvent.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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 "nsIDOMEvent.idl"
-
-[scriptable, builtinclass, uuid(97dc8040-d5c9-11e3-9c1a-0800200c9a66)]
-interface nsIDOMMozWifiStationInfoEvent : nsIDOMEvent
-{
-    /**
-     * The number of wifi stations connected to wifi hotspot.
-     */
-    readonly attribute short station;
-
-    [noscript] void initMozWifiStationInfoEvent(in DOMString aType,
-                                                in boolean aCanBubble,
-                                                in boolean aCancelable,
-                                                in short station);
-};
deleted file mode 100644
--- a/dom/wifi/nsIDOMMozWifiStatusChangeEvent.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * 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 "nsIDOMEvent.idl"
-
-interface nsIVariant;
-
-[builtinclass, uuid(251252ba-ed8c-47a0-8979-f7652b4d558a)]
-interface nsIDOMMozWifiStatusChangeEvent : nsIDOMEvent
-{
-    /**
-     * Network object with a SSID field describing the network affected by
-     * this change. This might be null.
-     */
-    readonly attribute nsIVariant network;
-
-    /**
-     * String describing the current status of the wifi manager. See above for
-     * the possible values.
-     */
-    readonly attribute DOMString status;
-
-    [noscript] void initMozWifiStatusChangeEvent(in DOMString aType,
-                                                 in boolean aCanBubble,
-                                                 in boolean aCancelable,
-                                                 in nsIVariant aNetwork,
-                                                 in DOMString aStatus);
-};
--- a/js/xpconnect/src/event_impl_gen.conf.in
+++ b/js/xpconnect/src/event_impl_gen.conf.in
@@ -16,29 +16,17 @@ simple_events = [
     'HashChangeEvent',
     'CloseEvent',
     'DeviceOrientationEvent',
     'MozApplicationEvent',
     'SmartCardEvent',
     'StyleRuleChangeEvent',
     'StyleSheetChangeEvent',
     'StyleSheetApplicableStateChangeEvent',
-#ifdef MOZ_WIDGET_GONK
-    'MozWifiP2pStatusChangeEvent',
-    'MozWifiStatusChangeEvent',
-    'MozWifiConnectionInfoEvent',
-    'MozWifiStationInfoEvent',
-#endif
-#ifdef MOZ_B2G_RIL
-    'MozCellBroadcastEvent',
-    'MozVoicemailEvent',
-#endif
     'ElementReplaceEvent',
-    'MozSmsEvent',
-    'MozMmsEvent',
 #ifdef MOZ_WEBSPEECH
     'SpeechSynthesisEvent',
 #endif
     'DeviceStorageChangeEvent',
     'PopupBlockedEvent',
     'RecordErrorEvent',
 #ifdef MOZ_WEBSPEECH
     'SpeechRecognitionEvent',
--- a/xpcom/reflect/xptinfo/src/ShimInterfaceInfo.cpp
+++ b/xpcom/reflect/xptinfo/src/ShimInterfaceInfo.cpp
@@ -111,28 +111,18 @@
 #include "nsIDOMMediaError.h"
 #include "nsIDOMMediaList.h"
 #include "nsIDOMMediaStream.h"
 #include "nsIDOMMessageEvent.h"
 #include "nsIDOMMouseEvent.h"
 #include "nsIDOMMouseScrollEvent.h"
 #include "nsIDOMMutationEvent.h"
 #include "nsIDOMMozApplicationEvent.h"
-#include "nsIDOMMozMmsEvent.h"
 #include "nsIDOMMozNamedAttrMap.h"
 #include "nsIDOMMozSettingsEvent.h"
-#include "nsIDOMMozSmsEvent.h"
-#ifdef MOZ_B2G_RIL
-#include "nsIDOMMozVoicemailEvent.h"
-#endif
-#ifdef MOZ_WIDGET_GONK
-#include "nsIDOMMozWifiConnectionInfoEvent.h"
-#include "nsIDOMMozWifiStatusChangeEvent.h"
-#include "nsIDOMMozWifiP2pStatusChangeEvent.h"
-#endif
 #include "nsIDOMNode.h"
 #include "nsIDOMNodeIterator.h"
 #include "nsIDOMNotifyPaintEvent.h"
 #include "nsIDOMNSEvent.h"
 #include "nsIDOMOfflineResourceList.h"
 #include "nsIDOMPageTransitionEvent.h"
 #include "nsIDOMPaintRequest.h"
 #include "nsIDOMParser.h"
@@ -280,28 +270,18 @@
 #include "mozilla/dom/MediaErrorBinding.h"
 #include "mozilla/dom/MediaListBinding.h"
 #include "mozilla/dom/MediaStreamBinding.h"
 #include "mozilla/dom/MessageEventBinding.h"
 #include "mozilla/dom/MouseEventBinding.h"
 #include "mozilla/dom/MouseScrollEventBinding.h"
 #include "mozilla/dom/MutationEventBinding.h"
 #include "mozilla/dom/MozApplicationEventBinding.h"
-#include "mozilla/dom/MozMmsEventBinding.h"
 #include "mozilla/dom/MozNamedAttrMapBinding.h"
 #include "mozilla/dom/MozSettingsEventBinding.h"
-#include "mozilla/dom/MozSmsEventBinding.h"
-#ifdef MOZ_B2G_RIL
-#include "mozilla/dom/MozVoicemailEventBinding.h"
-#endif
-#ifdef MOZ_WIDGET_GONK
-#include "mozilla/dom/MozWifiConnectionInfoEventBinding.h"
-#include "mozilla/dom/MozWifiStatusChangeEventBinding.h"
-#include "mozilla/dom/MozWifiP2pStatusChangeEventBinding.h"
-#endif
 #include "mozilla/dom/NodeIteratorBinding.h"
 #include "mozilla/dom/NodeBinding.h"
 #include "mozilla/dom/NotifyPaintEventBinding.h"
 #include "mozilla/dom/EventBinding.h"
 #include "mozilla/dom/OfflineResourceListBinding.h"
 #include "mozilla/dom/PageTransitionEventBinding.h"
 #include "mozilla/dom/PaintRequestBinding.h"
 #include "mozilla/dom/PopStateEventBinding.h"
@@ -500,28 +480,18 @@ const ComponentsInterfaceShimEntry kComp
   DEFINE_SHIM(MediaError),
   DEFINE_SHIM(MediaList),
   DEFINE_SHIM(MediaStream),
   DEFINE_SHIM(MessageEvent),
   DEFINE_SHIM(MouseEvent),
   DEFINE_SHIM(MouseScrollEvent),
   DEFINE_SHIM(MutationEvent),
   DEFINE_SHIM(MozApplicationEvent),
-  DEFINE_SHIM(MozMmsEvent),
   DEFINE_SHIM(MozNamedAttrMap),
   DEFINE_SHIM(MozSettingsEvent),
-  DEFINE_SHIM(MozSmsEvent),
-#ifdef MOZ_B2G_RIL
-  DEFINE_SHIM(MozVoicemailEvent),
-#endif
-#ifdef MOZ_WIDGET_GONK
-  DEFINE_SHIM(MozWifiConnectionInfoEvent),
-  DEFINE_SHIM(MozWifiP2pStatusChangeEvent),
-  DEFINE_SHIM(MozWifiStatusChangeEvent),
-#endif
   DEFINE_SHIM(NodeIterator),
   DEFINE_SHIM(Node),
   DEFINE_SHIM(NotifyPaintEvent),
   DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIDOMNSEvent, Event),
   DEFINE_SHIM(OfflineResourceList),
   DEFINE_SHIM(PageTransitionEvent),
   DEFINE_SHIM(PaintRequest),
   DEFINE_SHIM_WITH_CUSTOM_INTERFACE(nsIDOMParser, DOMParser),