From b3604eb0ca3d1e951920a79fbee40560647d9ae7 Mon Sep 17 00:00:00 2001
From: Wes Kocher <wkocher@mozilla.com>
Date: Mon, 4 Aug 2014 16:07:08 -0700
Subject: [PATCH] Backed out changeset a38bb1a95176 (bug 1048102) for build
 bustage on a CLOSED TREE

---
 content/media/gmp/GMPPlatform.cpp        | 11 +++--------
 content/media/gmp/gmp-api/gmp-platform.h |  2 +-
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/content/media/gmp/GMPPlatform.cpp b/content/media/gmp/GMPPlatform.cpp
index 1261db3a8a7..3ba7ac5c3e0 100644
--- a/content/media/gmp/GMPPlatform.cpp
+++ b/content/media/gmp/GMPPlatform.cpp
@@ -162,12 +162,10 @@ GMPThreadImpl::GMPThreadImpl()
 : mMutex("GMPThreadImpl"),
   mThread("GMPThread")
 {
-  MOZ_COUNT_CTOR(GMPThread);
 }
 
 GMPThreadImpl::~GMPThreadImpl()
 {
-  MOZ_COUNT_DTOR(GMPThread);
 }
 
 void
@@ -191,13 +189,10 @@ GMPThreadImpl::Post(GMPTask* aTask)
 void
 GMPThreadImpl::Join()
 {
-  {
-    MutexAutoLock lock(mMutex);
-    if (mThread.IsRunning()) {
-      mThread.Stop();
-    }
+  MutexAutoLock lock(mMutex);
+  if (mThread.IsRunning()) {
+    mThread.Stop();
   }
-  delete this;
 }
 
 GMPMutexImpl::GMPMutexImpl()
diff --git a/content/media/gmp/gmp-api/gmp-platform.h b/content/media/gmp/gmp-api/gmp-platform.h
index e84d6906f61..ada2a449086 100644
--- a/content/media/gmp/gmp-api/gmp-platform.h
+++ b/content/media/gmp/gmp-api/gmp-platform.h
@@ -50,7 +50,7 @@ class GMPThread {
 public:
   virtual ~GMPThread() {}
   virtual void Post(GMPTask* aTask) = 0;
-  virtual void Join() = 0; // Deletes GMPThread!
+  virtual void Join() = 0;
 };
 
 class GMPMutex {