Revert of Added stub MediaSourcePlayer for developing behind the flag

content/browser/media/android/browser_demuxer_android.h

Index: content/browser/media/android/browser_demuxer_android.h
diff --git a/content/browser/media/android/browser_demuxer_android.h b/content/browser/media/android/browser_demuxer_android.h
index 71ebd7f30b42a8ef627e2fe9660a8322d741463c..407e0b3288663ab1c37541a92a266b6f9a270db5 100644
--- a/content/browser/media/android/browser_demuxer_android.h
+++ b/content/browser/media/android/browser_demuxer_android.h
@@ -4,8 +4,6 @@
 
 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_
 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_
-
-#include <map>
 
 #include "base/id_map.h"
 #include "content/public/browser/browser_message_filter.h"
@@ -23,9 +21,8 @@
   BrowserDemuxerAndroid();
 
   // BrowserMessageFilter overrides.
-  base::TaskRunner* OverrideTaskRunnerForMessage(
-      const IPC::Message& message) override;
-
+  void OverrideThreadForMessage(const IPC::Message& message,
+                                BrowserThread::ID* thread) override;
   bool OnMessageReceived(const IPC::Message& message) override;
 
   // Returns an uninitialized demuxer implementation associated with
@@ -58,15 +55,6 @@
 
   IDMap<media::DemuxerAndroidClient> demuxer_clients_;
 
-  // When the demuxer client is created on UI thread but demuxer
-  // messages arrive on Media thread their relative order is undefined.
-  // Use |pending_configs_| map to keep the upcoming configurations
-  // until the client is created.
-  typedef std::map<int, media::DemuxerConfigs> ConfigsPerClient;
-  ConfigsPerClient pending_configs_;
-
-  base::SingleThreadTaskRunner* task_runner_;
-
   DISALLOW_COPY_AND_ASSIGN(BrowserDemuxerAndroid);
 };