Revert of Added stub MediaSourcePlayer for developing behind the flag

content/browser/media/android/browser_demuxer_android.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "media/base/android/demuxer_android.h"
 
 namespace content {
 
 // Represents the browser process half of an IPC-based demuxer proxy.
 // It vends out media::DemuxerAndroid instances that are registered with an
 // end point in the renderer process.
 //
 // Refer to RendererDemuxerAndroid for the renderer process half.
 class CONTENT_EXPORT BrowserDemuxerAndroid : public BrowserMessageFilter {
  public:
   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
   // |demuxer_client_id|, which can be used to communicate with the real demuxer
   // in the renderer process.
   scoped_ptr<media::DemuxerAndroid> CreateDemuxer(int demuxer_client_id);
 
  protected:
   friend class base::RefCountedThreadSafe<BrowserDemuxerAndroid>;
   ~BrowserDemuxerAndroid() override;
@@ skipping 12 matching lines @@
                       const media::DemuxerConfigs& configs);
   void OnReadFromDemuxerAck(int demuxer_client_id,
                             const media::DemuxerData& data);
   void OnDemuxerSeekDone(int demuxer_client_id,
                          const base::TimeDelta& actual_browser_seek_time);
   void OnDurationChanged(int demuxer_client_id,
                          const base::TimeDelta& duration);
 
   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);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MEDIA_ANDROID_BROWSER_DEMUXER_ANDROID_H_