Backed out changeset 8c69c6e6fc39 (bug 942633) for build failures on a CLOSED TREE
authorEd Morley <emorley@mozilla.com>
Tue, 26 Nov 2013 17:30:55 +0000
changeset 157557 c713a29dd25a83821bf618dbea2973367c4af9fb
parent 157556 abb41f4fdc5ddb91c051f4a2da3e0bdaff4b7456
child 157558 150932cb83bfe100c1f452a7c4ac734374e4d8e2
push id25716
push userkwierso@gmail.com
push dateWed, 27 Nov 2013 01:32:11 +0000
treeherdermozilla-central@d822990ba9ee [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs942633
milestone28.0a1
backs out8c69c6e6fc391b35730d13180f64d50d5e010055
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
Backed out changeset 8c69c6e6fc39 (bug 942633) for build failures on a CLOSED TREE
dom/media/moz.build
dom/network/src/TCPSocketChild.h
dom/network/src/TCPSocketParent.h
dom/network/src/moz.build
dom/plugins/base/moz.build
dom/plugins/ipc/PluginScriptableObjectChild.cpp
dom/plugins/ipc/PluginScriptableObjectParent.cpp
dom/plugins/ipc/hangui/moz.build
dom/plugins/ipc/interpose/moz.build
dom/plugins/ipc/moz.build
dom/plugins/test/testplugin/testplugin.mozbuild
dom/power/moz.build
dom/src/events/moz.build
dom/src/geolocation/moz.build
dom/src/json/moz.build
dom/src/jsurl/moz.build
dom/src/notification/moz.build
dom/src/offline/moz.build
dom/src/storage/moz.build
dom/system/moz.build
--- a/dom/media/moz.build
+++ b/dom/media/moz.build
@@ -25,17 +25,17 @@ XPIDL_MODULE = 'dom_media'
 EXPORTS.mozilla.dom += [
     'GetUserMediaRequest.h',
 ]
 
 EXPORTS.mozilla += [
     'MediaManager.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'GetUserMediaRequest.cpp',
     'MediaManager.cpp',
 ]
 
 EXTRA_COMPONENTS += [
     'PeerConnection.js',
     'PeerConnection.manifest',
 ]
--- a/dom/network/src/TCPSocketChild.h
+++ b/dom/network/src/TCPSocketChild.h
@@ -1,15 +1,12 @@
 /* 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_TCPSocketChild_h
-#define mozilla_dom_TCPSocketChild_h
-
 #include "mozilla/net/PTCPSocketChild.h"
 #include "nsITCPSocketChild.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsCOMPtr.h"
 #include "js/TypeDecls.h"
 
 #define TCPSOCKETCHILD_CID \
   { 0xa589d96f, 0x7e09, 0x4edf, { 0xa0, 0x1a, 0xeb, 0x49, 0x51, 0xf4, 0x2f, 0x37 } }
@@ -52,10 +49,8 @@ public:
   virtual bool RecvUpdateBufferedAmount(const uint32_t& aBufferred,
                                         const uint32_t& aTrackingNumber) MOZ_OVERRIDE;
 private:
   JSObject* mWindowObj;
 };
 
 } // namespace dom
 } // namespace mozilla
-
-#endif
--- a/dom/network/src/TCPSocketParent.h
+++ b/dom/network/src/TCPSocketParent.h
@@ -1,15 +1,12 @@
 /* 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_TCPSocketParent_h
-#define mozilla_dom_TCPSocketParent_h
-
 #include "mozilla/net/PTCPSocketParent.h"
 #include "nsITCPSocketParent.h"
 #include "nsCycleCollectionParticipant.h"
 #include "nsCOMPtr.h"
 #include "nsIDOMTCPSocket.h"
 #include "js/TypeDecls.h"
 
 #define TCPSOCKETPARENT_CID \
@@ -61,10 +58,8 @@ public:
 private:
   virtual void ActorDestroy(ActorDestroyReason why) MOZ_OVERRIDE;
 
   JSObject* mIntermediaryObj;
 };
 
 } // namespace dom
 } // namespace mozilla
-
-#endif
--- a/dom/network/src/moz.build
+++ b/dom/network/src/moz.build
@@ -10,32 +10,32 @@ EXPORTS.mozilla.dom.network += [
     'TCPServerSocketParent.h',
     'TCPSocketChild.h',
     'TCPSocketParent.h',
     'Types.h',
     'UDPSocketChild.h',
     'UDPSocketParent.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'Connection.cpp',
     'TCPServerSocketChild.cpp',
     'TCPServerSocketParent.cpp',
     'TCPSocketChild.cpp',
     'TCPSocketParent.cpp',
     'UDPSocketChild.cpp',
     'UDPSocketParent.cpp',
 ]
 
 if CONFIG['MOZ_B2G_RIL']:
     EXPORTS.mozilla.dom.network += [
         'MobileConnection.h',
         'MobileConnectionArray.h',
     ]
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'MobileConnection.cpp',
         'MobileConnectionArray.cpp',
     ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     EXTRA_JS_MODULES = [
         'NetworkStatsDB.jsm',
         'NetworkStatsService.jsm',
--- a/dom/plugins/base/moz.build
+++ b/dom/plugins/base/moz.build
@@ -37,65 +37,60 @@ EXPORTS += [
     'nsPluginsDir.h',
     'nsPluginTags.h',
 ]
 
 EXPORTS.mozilla += [
     'PluginPRLibrary.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsJSNPRuntime.cpp',
-    'nsPluginInstanceOwner.cpp',
-    'nsPluginModule.cpp',
-    'nsPluginPlayPreviewInfo.cpp',
-    'PluginPRLibrary.cpp',
-]
-
-# These files cannot be built in unified mode because they force NSPR logging.
-SOURCES += [
     'nsNPAPIPlugin.cpp',
     'nsNPAPIPluginInstance.cpp',
     'nsNPAPIPluginStreamListener.cpp',
     'nsPluginHost.cpp',
+    'nsPluginInstanceOwner.cpp',
+    'nsPluginModule.cpp',
+    'nsPluginPlayPreviewInfo.cpp',
     'nsPluginStreamListenerPeer.cpp',
     'nsPluginTags.cpp',
+    'PluginPRLibrary.cpp',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'nsPluginDirServiceProvider.cpp',
         'nsPluginNativeWindowWin.cpp',
         'nsPluginsDirWin.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'os2':
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'nsPluginNativeWindowOS2.cpp',
         'nsPluginsDirOS2.cpp',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'nsPluginNativeWindow.cpp',
         'nsPluginsDirDarwin.cpp',
     ]
 else:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'nsPluginsDirUnix.cpp',
     ]
     if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
-        # This file cannot be built in unified mode because of name clashes in X11 headers.
         SOURCES += [
             'nsPluginNativeWindowGtk2.cpp',
         ]
     elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt':
-        UNIFIED_SOURCES += [
+        SOURCES += [
             'nsPluginNativeWindowQt.cpp',
         ]
     else:
-        UNIFIED_SOURCES += [
+        SOURCES += [
             'nsPluginNativeWindow.cpp',
         ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     # android_npapi.h extends the NPNVariable and NPPVariable enums
     # using #defines, which results in Wswitch warnings in gcc-4.6.
     # Therefore, enable FAIL_ON_WARNINGS only on non-Android platforms.
     FAIL_ON_WARNINGS = True
--- a/dom/plugins/ipc/PluginScriptableObjectChild.cpp
+++ b/dom/plugins/ipc/PluginScriptableObjectChild.cpp
@@ -5,16 +5,20 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "PluginScriptableObjectChild.h"
 #include "PluginScriptableObjectUtils.h"
 #include "PluginIdentifierChild.h"
 
 using namespace mozilla::plugins;
 
+namespace {
+typedef PluginIdentifierChild::StackIdentifier StackIdentifier;
+}
+
 // static
 NPObject*
 PluginScriptableObjectChild::ScriptableAllocate(NPP aInstance,
                                                 NPClass* aClass)
 {
   AssertPluginThread();
 
   if (aClass != GetClass()) {
@@ -623,17 +627,17 @@ PluginScriptableObjectChild::AnswerHasMe
   NS_ASSERTION(mObject->_class != GetClass(), "Bad object type!");
   NS_ASSERTION(mType == LocalObject, "Bad type!");
 
   if (!(mObject->_class && mObject->_class->hasMethod)) {
     *aHasMethod = false;
     return true;
   }
 
-  PluginIdentifierChild::StackIdentifier id(aId);
+  StackIdentifier id(aId);
   *aHasMethod = mObject->_class->hasMethod(mObject, id->ToNPIdentifier());
   return true;
 }
 
 bool
 PluginScriptableObjectChild::AnswerInvoke(PPluginIdentifierChild* aId,
                                           const InfallibleTArray<Variant>& aArgs,
                                           Variant* aResult,
@@ -667,17 +671,17 @@ PluginScriptableObjectChild::AnswerInvok
   }
 
   for (uint32_t index = 0; index < argCount; index++) {
     ConvertToVariant(aArgs[index], convertedArgs[index]);
   }
 
   NPVariant result;
   VOID_TO_NPVARIANT(result);
-  PluginIdentifierChild::StackIdentifier id(aId);
+  StackIdentifier id(aId);
   bool success = mObject->_class->invoke(mObject, id->ToNPIdentifier(),
                                          convertedArgs.Elements(), argCount,
                                          &result);
 
   for (uint32_t index = 0; index < argCount; index++) {
     PluginModuleChild::sBrowserFuncs.releasevariantvalue(&convertedArgs[index]);
   }
 
@@ -788,17 +792,17 @@ PluginScriptableObjectChild::AnswerHasPr
   NS_ASSERTION(mObject->_class != GetClass(), "Bad object type!");
   NS_ASSERTION(mType == LocalObject, "Bad type!");
 
   if (!(mObject->_class && mObject->_class->hasProperty)) {
     *aHasProperty = false;
     return true;
   }
 
-  PluginIdentifierChild::StackIdentifier id(aId);
+  StackIdentifier id(aId);
   *aHasProperty = mObject->_class->hasProperty(mObject, id->ToNPIdentifier());
   return true;
 }
 
 bool
 PluginScriptableObjectChild::AnswerGetChildProperty(PPluginIdentifierChild* aId,
                                                     bool* aHasProperty,
                                                     bool* aHasMethod,
@@ -818,17 +822,17 @@ PluginScriptableObjectChild::AnswerGetCh
   NS_ASSERTION(mObject->_class != GetClass(), "Bad object type!");
   NS_ASSERTION(mType == LocalObject, "Bad type!");
 
   if (!(mObject->_class && mObject->_class->hasProperty &&
         mObject->_class->hasMethod && mObject->_class->getProperty)) {
     return true;
   }
 
-  PluginIdentifierChild::StackIdentifier stackID(aId);
+  StackIdentifier stackID(aId);
   NPIdentifier id = stackID->ToNPIdentifier();
 
   *aHasProperty = mObject->_class->hasProperty(mObject, id);
   *aHasMethod = mObject->_class->hasMethod(mObject, id);
 
   if (*aHasProperty) {
     NPVariant result;
     VOID_TO_NPVARIANT(result);
@@ -865,17 +869,17 @@ PluginScriptableObjectChild::AnswerSetPr
   NS_ASSERTION(mType == LocalObject, "Bad type!");
 
   if (!(mObject->_class && mObject->_class->hasProperty &&
         mObject->_class->setProperty)) {
     *aSuccess = false;
     return true;
   }
 
-  PluginIdentifierChild::StackIdentifier stackID(aId);
+  StackIdentifier stackID(aId);
   NPIdentifier id = stackID->ToNPIdentifier();
 
   if (!mObject->_class->hasProperty(mObject, id)) {
     *aSuccess = false;
     return true;
   }
 
   NPVariant converted;
@@ -903,17 +907,17 @@ PluginScriptableObjectChild::AnswerRemov
   NS_ASSERTION(mType == LocalObject, "Bad type!");
 
   if (!(mObject->_class && mObject->_class->hasProperty &&
         mObject->_class->removeProperty)) {
     *aSuccess = false;
     return true;
   }
 
-  PluginIdentifierChild::StackIdentifier stackID(aId);
+  StackIdentifier stackID(aId);
   NPIdentifier id = stackID->ToNPIdentifier();
   *aSuccess = mObject->_class->hasProperty(mObject, id) ?
               mObject->_class->removeProperty(mObject, id) :
               true;
 
   return true;
 }
 
--- a/dom/plugins/ipc/PluginScriptableObjectParent.cpp
+++ b/dom/plugins/ipc/PluginScriptableObjectParent.cpp
@@ -13,16 +13,18 @@
 #include "nsNPAPIPlugin.h"
 #include "PluginScriptableObjectUtils.h"
 
 using namespace mozilla::plugins;
 using namespace mozilla::plugins::parent;
 
 namespace {
 
+typedef PluginIdentifierParent::StackIdentifier StackIdentifier;
+
 inline void
 ReleaseVariant(NPVariant& aVariant,
                PluginInstanceParent* aInstance)
 {
   const NPNetscapeFuncs* npn = GetNetscapeFuncs(aInstance);
   if (npn) {
     npn->releasevariantvalue(&aVariant);
   }
@@ -101,17 +103,17 @@ PluginScriptableObjectParent::Scriptable
     return false;
   }
 
   ProtectedActor<PluginScriptableObjectParent> actor(object->parent);
   if (!actor) {
     return false;
   }
 
-  PluginIdentifierParent::StackIdentifier identifier(aObject, aName);
+  StackIdentifier identifier(aObject, aName);
   if (!identifier) {
     return false;
   }
 
   NS_ASSERTION(actor->Type() == Proxy, "Bad type!");
 
   bool result;
   if (!actor->CallHasMethod(identifier, &result)) {
@@ -141,17 +143,17 @@ PluginScriptableObjectParent::Scriptable
     return false;
   }
 
   ProtectedActor<PluginScriptableObjectParent> actor(object->parent);
   if (!actor) {
     return false;
   }
 
-  PluginIdentifierParent::StackIdentifier identifier(aObject, aName);
+  StackIdentifier identifier(aObject, aName);
   if (!identifier) {
     return false;
   }
 
   NS_ASSERTION(actor->Type() == Proxy, "Bad type!");
 
   ProtectedVariantArray args(aArgs, aArgCount, actor->GetInstance());
   if (!args.IsOk()) {
@@ -243,17 +245,17 @@ PluginScriptableObjectParent::Scriptable
     return false;
   }
 
   ProtectedActor<PluginScriptableObjectParent> actor(object->parent);
   if (!actor) {
     return false;
   }
 
-  PluginIdentifierParent::StackIdentifier identifier(aObject, aName);
+  StackIdentifier identifier(aObject, aName);
   if (!identifier) {
     return false;
   }
 
   NS_ASSERTION(actor->Type() == Proxy, "Bad type!");
 
   bool result;
   if (!actor->CallHasProperty(identifier, &result)) {
@@ -292,17 +294,17 @@ PluginScriptableObjectParent::Scriptable
     return false;
   }
 
   ProtectedActor<PluginScriptableObjectParent> actor(object->parent);
   if (!actor) {
     return false;
   }
 
-  PluginIdentifierParent::StackIdentifier identifier(aObject, aName);
+  StackIdentifier identifier(aObject, aName);
   if (!identifier) {
     return false;
   }
 
   NS_ASSERTION(actor->Type() == Proxy, "Bad type!");
 
   ProtectedVariant value(*aValue, actor->GetInstance());
   if (!value.IsOk()) {
@@ -335,17 +337,17 @@ PluginScriptableObjectParent::Scriptable
     return false;
   }
 
   ProtectedActor<PluginScriptableObjectParent> actor(object->parent);
   if (!actor) {
     return false;
   }
 
-  PluginIdentifierParent::StackIdentifier identifier(aObject, aName);
+  StackIdentifier identifier(aObject, aName);
   if (!identifier) {
     return false;
   }
 
   NS_ASSERTION(actor->Type() == Proxy, "Bad type!");
 
   bool success;
   if (!actor->CallRemoveProperty(identifier, &success)) {
@@ -1219,17 +1221,17 @@ PluginScriptableObjectParent::GetPropert
   NS_ASSERTION(Type() == Proxy, "Bad type!");
 
   ParentNPObject* object = static_cast<ParentNPObject*>(mObject);
   if (object->invalidated) {
     NS_WARNING("Calling method on an invalidated object!");
     return false;
   }
 
-  PluginIdentifierParent::StackIdentifier identifier(GetInstance(), aName);
+  StackIdentifier identifier(GetInstance(), aName);
   if (!identifier) {
     return false;
   }
 
   bool hasProperty, hasMethod, success;
   Variant result;
   if (!CallGetChildProperty(identifier, &hasProperty, &hasMethod, &result,
                             &success)) {
--- a/dom/plugins/ipc/hangui/moz.build
+++ b/dom/plugins/ipc/hangui/moz.build
@@ -3,14 +3,14 @@
 # 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/.
 
 FAIL_ON_WARNINGS = True
 
 PROGRAM = 'plugin-hang-ui'
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'MiniShmChild.cpp',
     'PluginHangUIChild.cpp',
 ]
 include('/ipc/chromium/chromium-config.mozbuild')
 
--- a/dom/plugins/ipc/interpose/moz.build
+++ b/dom/plugins/ipc/interpose/moz.build
@@ -1,15 +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/.
 
 LIBRARY_NAME = 'plugin_child_interpose'
 
-UNIFIED_SOURCES += [ "%s.mm" % (LIBRARY_NAME) ]
+SOURCES += [ "%s.mm" % (LIBRARY_NAME) ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'plugin_child_quirks.mm',
 ]
 
 FORCE_SHARED_LIB = True
--- a/dom/plugins/ipc/moz.build
+++ b/dom/plugins/ipc/moz.build
@@ -41,17 +41,17 @@ EXPORTS.mozilla.plugins += [
     'StreamNotifyChild.h',
     'StreamNotifyParent.h',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
     EXPORTS.mozilla.plugins += [
         'PluginSurfaceParent.h',
     ]
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'COMMessageFilter.cpp',
         'MiniShmParent.cpp',
         'PluginHangUIParent.cpp',
         'PluginSurfaceParent.cpp',
     ]
     DEFINES['MOZ_HANGUI_PROCESS_NAME'] = '"plugin-hang-ui%s"' % CONFIG['BIN_SUFFIX']
     LOCAL_INCLUDES += [
         '/widget/shared',
@@ -62,21 +62,20 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
     EXPORTS.mozilla.plugins += [
         'PluginInterposeOSX.h',
     ]
 
 if CONFIG['MOZ_ENABLE_QT']:
     GENERATED_SOURCES += [
         'moc_NestedLoopTimer.cpp',
     ]
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'NestedLoopTimer.cpp',
     ]
 
-# These files cannot be built in unified mode because they force NSPR logging.
 SOURCES += [
     'BrowserStreamChild.cpp',
     'BrowserStreamParent.cpp',
     'ChildAsyncCall.cpp',
     'ChildTimer.cpp',
     'PluginBackgroundDestroyer.cpp',
     'PluginIdentifierChild.cpp',
     'PluginIdentifierParent.cpp',
@@ -89,17 +88,16 @@ SOURCES += [
     'PluginProcessParent.cpp',
     'PluginScriptableObjectChild.cpp',
     'PluginScriptableObjectParent.cpp',
     'PluginStreamChild.cpp',
     'PluginStreamParent.cpp',
 ]
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
-    # These files cannot be built in unified mode because they force NSPR logging.
     SOURCES += [
         'PluginInterposeOSX.mm',
         'PluginUtilsOSX.mm',
     ]
 
 IPDL_SOURCES += [
     'PBrowserStream.ipdl',
     'PPluginBackgroundDestroyer.ipdl',
--- a/dom/plugins/test/testplugin/testplugin.mozbuild
+++ b/dom/plugins/test/testplugin/testplugin.mozbuild
@@ -1,44 +1,44 @@
 # -*- 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/.
 
 NO_DIST_INSTALL = True
 
-UNIFIED_SOURCES += [ '%s/%s' % (relative_path, p) for p in [
+SOURCES += [ '%s/%s' % (relative_path, p) for p in [
     'nptest.cpp',
     'nptest_utils.cpp',
 ]]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nptest_name.cpp',
 ]
 
 toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
 if toolkit == 'cocoa':
-    UNIFIED_SOURCES += [
+    SOURCES += [
         relative_path + '/nptest_macosx.mm'
     ]
 elif toolkit == 'gtk2':
-    UNIFIED_SOURCES += [
+    SOURCES += [
         relative_path + '/nptest_gtk2.cpp',
     ]
 elif toolkit == 'android':
-    UNIFIED_SOURCES += [
+    SOURCES += [
         relative_path + '/nptest_droid.cpp',
     ]
 elif toolkit == 'os2':
-    UNIFIED_SOURCES += [
+    SOURCES += [
         relative_path + '/nptest_os2.cpp',
     ]
 elif toolkit == 'qt':
-    UNIFIED_SOURCES += [
+    SOURCES += [
         relative_path + '/nptest_qt.cpp',
     ]
 elif toolkit == 'windows':
-    UNIFIED_SOURCES += [
+    SOURCES += [
         relative_path + '/nptest_windows.cpp',
     ]
 
 FORCE_SHARED_LIB = True
--- a/dom/power/moz.build
+++ b/dom/power/moz.build
@@ -19,17 +19,17 @@ EXPORTS.mozilla.dom += [
     'PowerManager.h',
 ]
 
 EXPORTS.mozilla.dom.power += [
     'PowerManagerService.h',
     'Types.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'PowerManager.cpp',
     'PowerManagerService.cpp',
     'WakeLock.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
--- a/dom/src/events/moz.build
+++ b/dom/src/events/moz.build
@@ -1,15 +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/.
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsJSEventListener.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 MSVC_ENABLE_PGO = True
 
 LOCAL_INCLUDES += [
--- a/dom/src/geolocation/moz.build
+++ b/dom/src/geolocation/moz.build
@@ -4,17 +4,17 @@
 # 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/.
 
 EXPORTS += [
     'nsGeoPosition.h',
     'nsGeoPositionIPCSerialiser.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsGeolocation.cpp',
     'nsGeoPosition.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
--- a/dom/src/json/moz.build
+++ b/dom/src/json/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['test']
 
 EXPORTS += [
     'nsJSON.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsJSON.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     '/content/base/src',
 ]
--- a/dom/src/jsurl/moz.build
+++ b/dom/src/jsurl/moz.build
@@ -5,17 +5,17 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 TEST_DIRS += ['test']
 
 EXPORTS += [
     'nsJSProtocolHandler.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsJSProtocolHandler.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     "/dom/base",
     "/netwerk/base/src",
--- a/dom/src/notification/moz.build
+++ b/dom/src/notification/moz.build
@@ -13,17 +13,17 @@ EXTRA_JS_MODULES += [
     'NotificationDB.jsm'
 ]
 
 EXPORTS.mozilla.dom += [
     'DesktopNotification.h',
     'Notification.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'DesktopNotification.cpp',
     'Notification.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
--- a/dom/src/offline/moz.build
+++ b/dom/src/offline/moz.build
@@ -2,17 +2,17 @@
 # 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/.
 
 EXPORTS += [
     'nsDOMOfflineResourceList.h',
 ]
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsDOMOfflineResourceList.cpp',
 ]
 
 FAIL_ON_WARNINGS = True
 
 LOCAL_INCLUDES += [
     "/content/base/src",
     "/content/events/src",
--- a/dom/src/storage/moz.build
+++ b/dom/src/storage/moz.build
@@ -3,17 +3,17 @@
 # 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/.
 
 EXPORTS.mozilla.dom += [
     'DOMStorageIPC.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'DOMStorage.cpp',
     'DOMStorageCache.cpp',
     'DOMStorageDBThread.cpp',
     'DOMStorageIPC.cpp',
     'DOMStorageManager.cpp',
     'DOMStorageObserver.cpp',
 ]
 
--- a/dom/system/moz.build
+++ b/dom/system/moz.build
@@ -28,17 +28,17 @@ XPIDL_MODULE = 'dom_system'
 EXPORTS += [
     'nsDeviceSensors.h',
 ]
 
 EXPORTS.mozilla += [
     'OSFileConstants.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsDeviceSensors.cpp',
     'OSFileConstants.cpp',
 ]
 
 # On Systems that have build in geolocation providers,
 # we really do not need these.
 if CONFIG['OS_TARGET'] != 'Android' or CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':
     EXTRA_COMPONENTS += [