Prepare MediaDrmBridge to work with MediaCodecPlayer

media/base/android/media_player_android.cc

Index: media/base/android/media_player_android.cc
diff --git a/media/base/android/media_player_android.cc b/media/base/android/media_player_android.cc
index f583932c48885671010cc766c1b51f4be900063d..ed38d971b0247694ad743cfd7961d40877cca82b 100644
--- a/media/base/android/media_player_android.cc
+++ b/media/base/android/media_player_android.cc
@@ -5,15 +5,11 @@
 #include "media/base/android/media_player_android.h"
 
 #include "base/android/jni_android.h"
-#include "base/command_line.h"
 #include "base/logging.h"
-#include "base/metrics/field_trial.h"
 #include "base/single_thread_task_runner.h"
-#include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "media/base/android/media_drm_bridge.h"
 #include "media/base/android/media_player_manager.h"
-#include "media/base/media_switches.h"
 
 namespace media {
 
@@ -89,19 +85,6 @@ void MediaPlayerAndroid::DetachListener() {
   listener_->ReleaseMediaPlayerListenerResources();
 }
 
-// static
-bool MediaPlayerAndroid::UseMediaThread() {
-  const std::string group_name =
-      base::FieldTrialList::FindFullName("EnableMediaThreadForMediaPlayback");
-
-  if (base::CommandLine::ForCurrentProcess()->
-      HasSwitch(switches::kEnableMediaThreadForMediaPlayback)) {
-    return true;
-  }
-
-  return base::StartsWith(group_name, "Enabled", base::CompareCase::SENSITIVE);
-}
-
 void MediaPlayerAndroid::DestroyListenerOnUIThread() {
   weak_factory_.InvalidateWeakPtrs();
   listener_.reset();