Backed out changeset 7b550d45454b (bug 1048104) for build bustage on a CLOSED TREE

content/media/gmp/GMPPlatform.cpp

@@ -203,18 +203,10 @@ GMPThreadImpl::Join()
 GMPMutexImpl::GMPMutexImpl()
 : mMutex("gmp-mutex")
 {
-  MOZ_COUNT_CTOR(GMPMutexImpl);
 }
 
 GMPMutexImpl::~GMPMutexImpl()
 {
-  MOZ_COUNT_DTOR(GMPMutexImpl);
-}
-
-void
-GMPMutexImpl::Destroy()
-{
-  delete this;
 }
 
 void

content/media/gmp/GMPPlatform.h

@@ -41,7 +41,6 @@ public:
   // GMPMutex
   virtual void Acquire() MOZ_OVERRIDE;
   virtual void Release() MOZ_OVERRIDE;
-  virtual void Destroy() MOZ_OVERRIDE;
 
 private:
   Mutex mMutex;

content/media/gmp/gmp-api/gmp-platform.h

@@ -41,7 +41,7 @@
 
 class GMPTask {
 public:
-  virtual void Destroy() = 0; // Deletes object.
+  virtual void Destroy() = 0;
   virtual ~GMPTask() {}
   virtual void Run() = 0;
 };
@@ -50,7 +50,7 @@ class GMPThread {
 public:
   virtual ~GMPThread() {}
   virtual void Post(GMPTask* aTask) = 0;
-  virtual void Join() = 0; // Deletes object after join completes.
+  virtual void Join() = 0; // Deletes GMPThread!
 };
 
 class GMPMutex {
@@ -58,7 +58,6 @@ public:
   virtual ~GMPMutex() {}
   virtual void Acquire() = 0;
   virtual void Release() = 0;
-  virtual void Destroy() = 0; // Deletes object.
 };
 
 // Time is defined as the number of milliseconds since the