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..a0e8998b8f84853060a0f2c52bde17d885353921 100644
--- a/content/browser/media/android/browser_demuxer_android.h
+++ b/content/browser/media/android/browser_demuxer_android.h
@@ -6,6 +6,7 @@
 #define CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_
 
 #include "base/id_map.h"
+#include "base/synchronization/lock.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "media/base/android/demuxer_android.h"
 
@@ -53,7 +54,12 @@ class CONTENT_EXPORT BrowserDemuxerAndroid : public BrowserMessageFilter {
   void OnDurationChanged(int demuxer_client_id,
                          const base::TimeDelta& duration);
 
+  media::DemuxerAndroidClient* Lookup(int demuxer_client_id);

[xhwang, 2015/04/24 05:04:13]

nit: Something like GetDemuxerClient() to be consistent with other functions?

+
+
   IDMap<media::DemuxerAndroidClient> demuxer_clients_;
+  base::Lock lock_;

[xhwang, 2015/04/24 05:04:13]

Add a comment why we need this and what needs to be protected by this lock.

+  bool enable_media_thread_for_media_playback_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserDemuxerAndroid);
 };