Backed out changeset 040522aacba4 (bug 913847)

content/events/src/nsDOMEventTargetHelper.h

@@ -13,7 +13,7 @@
 #include "nsIScriptGlobalObject.h"
 #include "nsEventListenerManager.h"
 #include "nsIScriptContext.h"
-#include "MainThreadUtils.h"
+#include "nsThreadUtils.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/dom/EventTarget.h"
 

content/media/MediaStreamGraph.h

@@ -15,9 +15,7 @@
 #include "TimeVarying.h"
 #include "VideoFrameContainer.h"
 #include "VideoSegment.h"
-#include "MainThreadUtils.h"
-
-class nsIRunnable;
+#include "nsThreadUtils.h"
 
 namespace mozilla {
 

dom/bindings/BindingUtils.h

@@ -23,7 +23,7 @@
 #include "mozilla/Util.h"
 #include "nsCycleCollector.h"
 #include "nsIXPConnect.h"
-#include "MainThreadUtils.h"
+#include "nsThreadUtils.h" // Hacky work around for some bindings needing NS_IsMainThread.
 #include "nsTraceRefcnt.h"
 #include "qsObjectHelper.h"
 #include "xpcpublic.h"

dom/indexedDB/IDBObjectStore.h

@@ -13,7 +13,7 @@
 #include "mozilla/dom/IDBIndexBinding.h"
 #include "mozilla/dom/IDBObjectStoreBinding.h"
 #include "nsCycleCollectionParticipant.h"
-#include "MainThreadUtils.h"
+#include "nsThreadUtils.h"
 
 #include "mozilla/dom/indexedDB/IDBRequest.h"
 #include "mozilla/dom/indexedDB/IDBTransaction.h"

dom/plugins/base/nsNPAPIPluginInstance.cpp

@@ -23,7 +23,6 @@
 #include "nsContentUtils.h"
 #include "nsPluginInstanceOwner.h"
 
-#include "nsThreadUtils.h"
 #include "nsIDOMElement.h"
 #include "nsIDocument.h"
 #include "nsIDocShell.h"

dom/plugins/base/nsPluginHost.h

@@ -19,7 +19,7 @@
 #include "nsWeakPtr.h"
 #include "nsIPrompt.h"
 #include "nsWeakReference.h"
-#include "MainThreadUtils.h"
+#include "nsThreadUtils.h"
 #include "nsTArray.h"
 #include "nsTObserverArray.h"
 #include "nsITimer.h"

dom/src/storage/DOMStorageCache.cpp

@@ -14,7 +14,6 @@
 #include "nsXULAppAPI.h"
 #include "mozilla/unused.h"
 #include "nsProxyRelease.h"
-#include "nsThreadUtils.h"
 
 namespace mozilla {
 namespace dom {

js/xpconnect/src/xpcprivate.h

@@ -127,7 +127,7 @@
 #include "nsXPIDLString.h"
 #include "nsAutoJSValHolder.h"
 
-#include "MainThreadUtils.h"
+#include "nsThreadUtils.h"
 #include "nsIJSEngineTelemetryStats.h"
 
 #include "nsIConsoleService.h"

layout/build/nsLayoutStatics.h

@@ -6,9 +6,7 @@
 #define nsLayoutStatics_h__
 
 #include "nscore.h"
-#include "MainThreadUtils.h"
-#include "nsTraceRefcnt.h"
-#include "nsDebug.h"
+#include "nsThreadUtils.h"
 
 // This isn't really a class, it's a namespace for static methods.
 // Documents and other objects can hold a reference to the layout static

netwerk/base/src/nsServerSocket.cpp

@@ -12,7 +12,6 @@
 #include "nsNetCID.h"
 #include "prnetdb.h"
 #include "prio.h"
-#include "nsThreadUtils.h"
 #include "mozilla/Attributes.h"
 #include "mozilla/net/DNS.h"
 

netwerk/base/src/nsUDPServerSocket.cpp

@@ -20,7 +20,6 @@
 #include "nsIPipe.h"
 #include "prerror.h"
 #include "nsINSSErrorsService.h"
-#include "nsThreadUtils.h"
 
 using namespace mozilla::net;
 using namespace mozilla;

netwerk/protocol/http/nsHttpTransaction.h

@@ -12,7 +12,7 @@
 #include "nsAHttpConnection.h"
 #include "EventTokenBucket.h"
 #include "nsCOMPtr.h"
-#include "nsThreadUtils.h"
+
 #include "nsIPipe.h"
 #include "nsIInputStream.h"
 #include "nsILoadGroup.h"

netwerk/protocol/wyciwyg/nsWyciwygChannel.cpp

@@ -14,7 +14,6 @@
 #include "nsICacheSession.h"
 #include "nsCharsetSource.h"
 #include "nsProxyRelease.h"
-#include "nsThreadUtils.h"
 
 // Must release mChannel on the main thread
 class nsWyciwygAsyncEvent : public nsRunnable {

security/manager/ssl/src/nsNSSComponent.cpp

@@ -17,7 +17,6 @@
 #include "nsDirectoryServiceDefs.h"
 #include "nsICertOverrideService.h"
 #include "mozilla/Preferences.h"
-#include "nsThreadUtils.h"
 
 #ifndef MOZ_DISABLE_CRYPTOLEGACY
 #include "nsIDOMNode.h"

storage/src/mozStorageStatementData.h

@@ -13,7 +13,7 @@
 #include "nsTArray.h"
 #include "nsIEventTarget.h"
 #include "mozilla/Util.h"
-#include "MainThreadUtils.h"
+#include "nsThreadUtils.h"
 
 #include "mozStorageBindingParamsArray.h"
 #include "mozIStorageBaseStatement.h"

toolkit/components/places/AsyncFaviconHelpers.h

@@ -11,7 +11,6 @@
 #include "nsIChannelEventSink.h"
 #include "nsIInterfaceRequestor.h"
 #include "nsIStreamListener.h"
-#include "nsThreadUtils.h"
 
 #include "Database.h"
 #include "mozilla/storage.h"

toolkit/components/places/Database.h

@@ -5,14 +5,13 @@
 #ifndef mozilla_places_Database_h_
 #define mozilla_places_Database_h_
 
-#include "MainThreadUtils.h"
+#include "nsThreadUtils.h"
 #include "nsWeakReference.h"
 #include "nsIInterfaceRequestorUtils.h"
 #include "nsIObserver.h"
 #include "mozilla/storage.h"
 #include "mozilla/storage/StatementCache.h"
 #include "mozilla/Attributes.h"
-#include "nsIEventTarget.h"
 
 // This is the schema version. Update it at any schema change and add a
 // corresponding migrateVxx method below.
@@ -44,7 +43,6 @@
 #define TOPIC_PLACES_CONNECTION_CLOSED "places-connection-closed"
 
 class nsIStringBundle;
-class nsIRunnable;
 
 namespace mozilla {
 namespace places {

xpcom/base/ClearOnShutdown.h

@@ -9,7 +9,7 @@
 
 #include "mozilla/LinkedList.h"
 #include "mozilla/StaticPtr.h"
-#include "MainThreadUtils.h"
+#include "nsThreadUtils.h"
 
 /*
  * This header exports one public method in the mozilla namespace:

xpcom/glue/nsProxyRelease.h

@@ -9,7 +9,7 @@
 #include "nsIEventTarget.h"
 #include "nsCOMPtr.h"
 #include "nsAutoPtr.h"
-#include "MainThreadUtils.h"
+#include "nsThreadUtils.h"
 #include "mozilla/Likely.h"
 
 #ifdef XPCOM_GLUE_AVOID_NSPR
@@ -122,8 +122,7 @@ public:
     if (NS_IsMainThread()) {
       NS_IF_RELEASE(mRawPtr);
     } else if (mRawPtr) {
-      nsIThread* mainThread = nullptr;
-      NS_GetMainThread(&mainThread);
+      nsCOMPtr<nsIThread> mainThread = do_GetMainThread();
       if (!mainThread) {
         NS_WARNING("Couldn't get main thread! Leaking pointer.");
         return;