Bug 1445540 - Use IsCurrentThreadRunningWorker() instead of GetCurrentThreadWorkerPrivate() in dom/base and dom/promise, r=smaug

dom/base/ImageEncoder.cpp

@@ -89,7 +89,7 @@ public:
     , mEncodeCompleteCallback(aEncodeCompleteCallback)
     , mFailed(false)
   {
-    if (!NS_IsMainThread() && GetCurrentThreadWorkerPrivate()) {
+    if (!NS_IsMainThread() && IsCurrentThreadRunningWorker()) {
       mCreationEventTarget = GetCurrentThreadEventTarget();
     } else {
       mCreationEventTarget = GetMainThreadEventTarget();

dom/promise/Promise.cpp

@@ -646,11 +646,8 @@ PromiseWorkerProxy::~PromiseWorkerProxy()
 void
 PromiseWorkerProxy::CleanProperties()
 {
-#ifdef DEBUG
-  WorkerPrivate* worker = GetCurrentThreadWorkerPrivate();
-  MOZ_ASSERT(worker);
-  worker->AssertIsOnWorkerThread();
-#endif
+  MOZ_ASSERT(IsCurrentThreadRunningWorker());
+
   // Ok to do this unprotected from Create().
   // CleanUp() holds the lock before calling this.
   mCleanedUp = true;
@@ -699,11 +696,7 @@ PromiseWorkerProxy::GetWorkerPrivate() const
 Promise*
 PromiseWorkerProxy::WorkerPromise() const
 {
-#ifdef DEBUG
-  WorkerPrivate* worker = GetCurrentThreadWorkerPrivate();
-  MOZ_ASSERT(worker);
-  worker->AssertIsOnWorkerThread();
-#endif
+  MOZ_ASSERT(IsCurrentThreadRunningWorker());
   MOZ_ASSERT(mWorkerPromise);
   return mWorkerPromise;
 }