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 407e0b3288663ab1c37541a92a266b6f9a270db5..116457d5af9b56ebf64e03de0b19f7ba196b55b1 100644
--- a/content/browser/media/android/browser_demuxer_android.h
+++ b/content/browser/media/android/browser_demuxer_android.h
@@ -5,7 +5,11 @@
 #ifndef CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_
 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_
 
+#define DISABLE_NON_THREAD_SAFE

[qinmin, 2015/04/27 22:16:20]

why cannot we just define ENABLE_THREAD_SAFE 0? And do we have to stick to
id_map?

[timav, 2015/04/27 23:33:00]

I did it here because ENABLE_THREAD_SAFE seemed to be redefined within id_map.h,
in non_thread_safe.h which is included inside.

But this all should be obsolete now, with Patch Set 7 we do not need these
hacks.

 #include "base/id_map.h"
+#undef DISABLE_NON_THREAD_SAFE
+
+#include "base/synchronization/lock.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "media/base/android/demuxer_android.h"
 
@@ -21,8 +25,9 @@ class CONTENT_EXPORT BrowserDemuxerAndroid : public BrowserMessageFilter {
   BrowserDemuxerAndroid();
 
   // BrowserMessageFilter overrides.
-  void OverrideThreadForMessage(const IPC::Message& message,
-                                BrowserThread::ID* thread) override;
+  base::TaskRunner* OverrideTaskRunnerForMessage(
+      const IPC::Message& message) override;
+
   bool OnMessageReceived(const IPC::Message& message) override;
 
   // Returns an uninitialized demuxer implementation associated with
@@ -53,7 +58,12 @@ class CONTENT_EXPORT BrowserDemuxerAndroid : public BrowserMessageFilter {
   void OnDurationChanged(int demuxer_client_id,
                          const base::TimeDelta& duration);
 
+  media::DemuxerAndroidClient* Lookup(int demuxer_client_id);
+
+
   IDMap<media::DemuxerAndroidClient> demuxer_clients_;
+  base::Lock lock_;
+  bool enable_media_thread_for_media_playback_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserDemuxerAndroid);
 };