Prepare MediaDrmBridge to work with MediaCodecPlayer

media/base/android/media_codec_player.cc

 // Copyright 2015 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 "media/base/android/media_codec_player.h"
 
 #include "base/barrier_closure.h"
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
 #include "media/base/android/media_codec_audio_decoder.h"
 #include "media/base/android/media_codec_video_decoder.h"
 #include "media/base/android/media_player_manager.h"
+#include "media/base/android/media_task_runner.h"
 #include "media/base/timestamp_constants.h"
 
 #define RUN_ON_MEDIA_THREAD(METHOD, ...)                                     \
   do {                                                                       \
     if (!GetMediaTaskRunner()->BelongsToCurrentThread()) {                   \
       DCHECK(ui_task_runner_->BelongsToCurrentThread());                     \
       GetMediaTaskRunner()->PostTask(                                        \
           FROM_HERE, base::Bind(&MediaCodecPlayer::METHOD, media_weak_this_, \
                                 ##__VA_ARGS__));                             \
       return;                                                                \
     }                                                                        \
   } while (0)
 
 namespace media {
 
-class MediaThread : public base::Thread {
- public:
-  MediaThread() : base::Thread("BrowserMediaThread") {
-    Start();
-  }
-};
-
-// Create media thread
-base::LazyInstance<MediaThread>::Leaky
-    g_media_thread = LAZY_INSTANCE_INITIALIZER;
-
-
-scoped_refptr<base::SingleThreadTaskRunner> GetMediaTaskRunner() {
-  return g_media_thread.Pointer()->task_runner();
-}
-
 // MediaCodecPlayer implementation.
 
 MediaCodecPlayer::MediaCodecPlayer(
     int player_id,
     base::WeakPtr<MediaPlayerManager> manager,
     const RequestMediaResourcesCB& request_media_resources_cb,
     scoped_ptr<DemuxerAndroid> demuxer,
     const GURL& frame_url)
     : MediaPlayerAndroid(player_id,
                          manager.get(),
@@ skipping 1177 matching lines @@
     RETURN_STRING(kStateWaitingForSurface);
     RETURN_STRING(kStateWaitingForSeek);
     RETURN_STRING(kStateError);
   }
   return nullptr;  // crash early
 }
 
 #undef RETURN_STRING
 
 }  // namespace media