Bug 1386971 - Remove NS_DispatchToMainThread and use nsIEventTarget to dispatch instead. r=cpearce

MozReview-Commit-ID: DeN3Cl9fyp2

--HG--
extra : rebase_source : 535bdd4ccf19f766ef65a11fdafc638025e3ebe5

dom/media/gmp/ChromiumCDMProxy.cpp

@@ -10,6 +10,8 @@
 #include "nsPrintfCString.h"
 #include "GMPService.h"
 
+#define NS_DispatchToMainThread(...) CompileError_UseAbstractMainThreadInstead
+
 namespace mozilla {
 
 ChromiumCDMProxy::ChromiumCDMProxy(dom::MediaKeys* aKeys,
@@ -380,15 +382,15 @@ ChromiumCDMProxy::RejectPromise(PromiseId aId,
                                 const nsCString& aReason)
 {
   if (!NS_IsMainThread()) {
-    nsCOMPtr<nsIRunnable> task;
-    task = NewRunnableMethod<PromiseId, nsresult, nsCString>(
-      "ChromiumCDMProxy::RejectPromise",
-      this,
-      &ChromiumCDMProxy::RejectPromise,
-      aId,
-      aCode,
-      aReason);
-    NS_DispatchToMainThread(task);
+    mMainThread->Dispatch(
+        NewRunnableMethod<PromiseId, nsresult, nsCString>(
+            "ChromiumCDMProxy::RejectPromise",
+            this,
+            &ChromiumCDMProxy::RejectPromise,
+            aId,
+            aCode,
+            aReason),
+        NS_DISPATCH_NORMAL);
     return;
   }
   EME_LOG("ChromiumCDMProxy::RejectPromise(pid=%u, code=0x%x, reason='%s')",
@@ -404,12 +406,12 @@ void
 ChromiumCDMProxy::ResolvePromise(PromiseId aId)
 {
   if (!NS_IsMainThread()) {
-    nsCOMPtr<nsIRunnable> task;
-    task = NewRunnableMethod<PromiseId>("ChromiumCDMProxy::ResolvePromise",
-                                        this,
-                                        &ChromiumCDMProxy::ResolvePromise,
-                                        aId);
-    NS_DispatchToMainThread(task);
+    mMainThread->Dispatch(
+        NewRunnableMethod<PromiseId>("ChromiumCDMProxy::ResolvePromise",
+                                     this,
+                                     &ChromiumCDMProxy::ResolvePromise,
+                                     aId),
+        NS_DISPATCH_NORMAL);
     return;
   }
 
@@ -607,3 +609,5 @@ ChromiumCDMProxy::GetCDMParent()
 }
 
 } // namespace mozilla
+
+#undef NS_DispatchToMainThread