Merge 219225 "Run |demuxer_| related tasks in the media thread i..."

content/renderer/media/android/webmediaplayer_android.h

Index: content/renderer/media/android/webmediaplayer_android.h
===================================================================
--- content/renderer/media/android/webmediaplayer_android.h	(revision 220850)
+++ content/renderer/media/android/webmediaplayer_android.h	(working copy)
@@ -77,6 +77,7 @@
       RendererMediaPlayerManager* manager,
       WebMediaPlayerProxyAndroid* proxy,
       StreamTextureFactory* factory,
+      const scoped_refptr<base::MessageLoopProxy>& media_loop,
       media::MediaLog* media_log);
   virtual ~WebMediaPlayerAndroid();
 
@@ -302,6 +303,9 @@
   // Message loop for main renderer thread.
   const scoped_refptr<base::MessageLoopProxy> main_loop_;
 
+  // Message loop for media thread.
+  const scoped_refptr<base::MessageLoopProxy> media_loop_;
+
   // URL of the media file to be fetched.
   GURL url_;