Prepare MediaDrmBridge to work with MediaCodecPlayer

content/browser/media/android/browser_demuxer_android.cc

 // 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.
 
 #include "content/browser/media/android/browser_demuxer_android.h"
 
 #include "content/common/media/media_player_messages_android.h"
-#include "media/base/android/media_codec_player.h"
+#include "media/base/android/media_task_runner.h"
 #include "media/base/media_switches.h"
 
 namespace content {
 
 class BrowserDemuxerAndroid::Internal : public media::DemuxerAndroid {
  public:
   Internal(const scoped_refptr<BrowserDemuxerAndroid>& demuxer,
            int demuxer_client_id)
       : demuxer_(demuxer),
         demuxer_client_id_(demuxer_client_id) {}
@@ skipping 30 matching lines @@
 
   scoped_refptr<BrowserDemuxerAndroid> demuxer_;
   int demuxer_client_id_;
 
   DISALLOW_COPY_AND_ASSIGN(Internal);
 };
 
 BrowserDemuxerAndroid::BrowserDemuxerAndroid()
     : BrowserMessageFilter(MediaPlayerMsgStart) {
   task_runner_ =
-      media::MediaPlayerAndroid::UseMediaThread() ?
+      media::UseMediaThreadForMediaPlayback() ?
       media::GetMediaTaskRunner().get() :
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI).get();
 
 }
 
 BrowserDemuxerAndroid::~BrowserDemuxerAndroid() {}
 
 base::TaskRunner* BrowserDemuxerAndroid::OverrideTaskRunnerForMessage(
     const IPC::Message& message) {
 
@@ skipping 97 matching lines @@
   media::DemuxerAndroidClient* client =
       demuxer_clients_.Lookup(demuxer_client_id);
 
   if (client)
     client->OnDemuxerDurationChanged(duration);
   else
     pending_configs_[demuxer_client_id].duration = duration;
 }
 
 }  // namespace content