Issue %2 - De-unify sources in xpcom (2 of 2)

11 files changed, 20 insertions, 12 deletions

diff --git a/xpcom/reflect/xptinfo/moz.build b/xpcom/reflect/xptinfo/moz.build
index 4c9fecb6d..475dffb4f 100644
--- a/xpcom/reflect/xptinfo/moz.build
+++ b/xpcom/reflect/xptinfo/moz.build
@@ -3,7 +3,7 @@
 # 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 += [
     'ShimInterfaceInfo.cpp',
     'xptiInterfaceInfo.cpp',
     'xptiInterfaceInfoManager.cpp',
diff --git a/xpcom/string/moz.build b/xpcom/string/moz.build
index 4262406e4..8c26eb0e4 100644
--- a/xpcom/string/moz.build
+++ b/xpcom/string/moz.build
@@ -37,7 +37,7 @@ EXPORTS += [
     'string-template-undef.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'nsDependentString.cpp',
     'nsDependentSubstring.cpp',
     'nsPromiseFlatString.cpp',
diff --git a/xpcom/string/nsTSubstring.cpp b/xpcom/string/nsTSubstring.cpp
index fbc270e12..7c3c64526 100644
--- a/xpcom/string/nsTSubstring.cpp
+++ b/xpcom/string/nsTSubstring.cpp
@@ -5,6 +5,7 @@
 
 #include "mozilla/CheckedInt.h"
 #include "mozilla/double-conversion.h"
+#include "mozilla/MathAlgorithms.h"
 #include "mozilla/MemoryReporting.h"
 
 using double_conversion::DoubleToStringConverter;
diff --git a/xpcom/tests/gtest/moz.build b/xpcom/tests/gtest/moz.build
index 16a5d17d8..b443ed2d5 100644
--- a/xpcom/tests/gtest/moz.build
+++ b/xpcom/tests/gtest/moz.build
@@ -3,7 +3,7 @@
 # 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 += [
     'Helpers.cpp',
     'TestAtoms.cpp',
     'TestAutoPtr.cpp',
@@ -49,18 +49,18 @@ UNIFIED_SOURCES += [
 
 if CONFIG['MOZ_DEBUG'] and CONFIG['OS_ARCH'] not in ('WINNT'):
     # FIXME bug 523392: TestDeadlockDetector doesn't like Windows
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'TestDeadlockDetector.cpp',
         'TestDeadlockDetectorScalability.cpp',
     ]
 
 if CONFIG['OS_TARGET'] == 'WINNT':
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'TestFilePreferencesWin.cpp',
     ]
 
 if CONFIG['WRAP_STL_INCLUDES'] and not CONFIG['CLANG_CL']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'TestSTLWrappers.cpp',
     ]
 
diff --git a/xpcom/tests/windows/moz.build b/xpcom/tests/windows/moz.build
index 428cb34cd..d517cfa4d 100644
--- a/xpcom/tests/windows/moz.build
+++ b/xpcom/tests/windows/moz.build
@@ -3,7 +3,7 @@
 # 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 += [
     'TestCOM.cpp',
     'TestNtPathToDosPath.cpp',
 ]
diff --git a/xpcom/threads/HangAnnotations.cpp b/xpcom/threads/HangAnnotations.cpp
index 9e5a890ba..5f0676745 100644
--- a/xpcom/threads/HangAnnotations.cpp
+++ b/xpcom/threads/HangAnnotations.cpp
@@ -7,8 +7,10 @@
 
 #include <vector>
 
+#include "BackgroundHangMonitor.h"
 #include "MainThreadUtils.h"
 #include "mozilla/DebugOnly.h"
+#include "mozilla/StaticPtr.h"
 #include "nsXULAppAPI.h"
 
 namespace mozilla {
diff --git a/xpcom/threads/ThrottledEventQueue.cpp b/xpcom/threads/ThrottledEventQueue.cpp
index 7eeef6e37..63324183a 100644
--- a/xpcom/threads/ThrottledEventQueue.cpp
+++ b/xpcom/threads/ThrottledEventQueue.cpp
@@ -8,8 +8,12 @@
 #include "mozilla/Atomics.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/Mutex.h"
+#include "mozilla/Services.h"
 #include "mozilla/Unused.h"
 #include "nsEventQueue.h"
+#include "nsIObserver.h"
+#include "nsIObserverService.h"
+#include "nsThreadUtils.h"
 
 namespace mozilla {
 
diff --git a/xpcom/threads/moz.build b/xpcom/threads/moz.build
index 381cd148f..10d9e47b1 100644
--- a/xpcom/threads/moz.build
+++ b/xpcom/threads/moz.build
@@ -45,7 +45,7 @@ EXPORTS.mozilla += [
     'ThrottledEventQueue.h',
 ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'AbstractThread.cpp',
     'BackgroundHangMonitor.cpp',
     'HangAnnotations.cpp',
@@ -72,11 +72,9 @@ LOCAL_INCLUDES += [
     '/tools/profiler',
 ]
 
-# BHR disabled for Release builds because of bug 965392.
 # BHR disabled for debug builds because of bug 979069.
 # BHR disabled for TSan builds because of bug 1121216.
-if CONFIG['MOZ_UPDATE_CHANNEL'] not in ('release') and \
-   not CONFIG['MOZ_DEBUG'] and \
+if not CONFIG['MOZ_DEBUG'] and \
    not CONFIG['MOZ_TSAN']:
     DEFINES['MOZ_ENABLE_BACKGROUND_HANG_MONITOR'] = 1
 
diff --git a/xpcom/threads/nsThread.cpp b/xpcom/threads/nsThread.cpp
index ed67fa659..a486c2bd9 100644
--- a/xpcom/threads/nsThread.cpp
+++ b/xpcom/threads/nsThread.cpp
@@ -29,6 +29,7 @@
 #include "mozilla/ipc/BackgroundChild.h"
 #include "mozilla/Services.h"
 #include "nsXPCOMPrivate.h"
+#include "nsComponentManagerUtils.h"
 #include "mozilla/ChaosMode.h"
 #include "mozilla/TimeStamp.h"
 #include "mozilla/Unused.h"
diff --git a/xpcom/threads/nsTimerImpl.cpp b/xpcom/threads/nsTimerImpl.cpp
index 9e58ed023..3ca54fd61 100644
--- a/xpcom/threads/nsTimerImpl.cpp
+++ b/xpcom/threads/nsTimerImpl.cpp
@@ -13,6 +13,7 @@
 #include "mozilla/Atomics.h"
 #include "mozilla/IntegerPrintfMacros.h"
 #include "mozilla/Logging.h"
+
 #ifdef MOZ_TASK_TRACER
 #include "GeckoTaskTracerImpl.h"
 using namespace mozilla::tasktracer;
@@ -27,6 +28,7 @@ using namespace mozilla::tasktracer;
 #include <unistd.h>
 #endif
 
+using namespace mozilla;
 using mozilla::Atomic;
 using mozilla::LogLevel;
 using mozilla::TimeDuration;
diff --git a/xpcom/typelib/xpt/moz.build b/xpcom/typelib/xpt/moz.build
index fc0469d9f..9b2da3d5e 100644
--- a/xpcom/typelib/xpt/moz.build
+++ b/xpcom/typelib/xpt/moz.build
@@ -7,7 +7,7 @@ Library('xpt')
 
 DIRS += ['tools']
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'xpt_arena.cpp',
     'xpt_struct.cpp',
     'xpt_xdr.cpp',