Prepare MediaDrmBridge to work with MediaCodecPlayer

media/base/android/media_player_android.cc

 // Copyright (c) 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 "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 {
 
 MediaPlayerAndroid::MediaPlayerAndroid(
     int player_id,
     MediaPlayerManager* manager,
     const RequestMediaResourcesCB& request_media_resources_cb,
     const GURL& frame_url)
     : request_media_resources_cb_(request_media_resources_cb),
       player_id_(player_id),
@@ skipping 55 matching lines @@
   jobject j_context = base::android::GetApplicationContext();
   DCHECK(j_context);
 
   listener_->CreateMediaPlayerListener(j_context, j_media_player);
 }
 
 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();
 }
 
 base::WeakPtr<MediaPlayerAndroid> MediaPlayerAndroid::WeakPtrForUIThread() {
   return weak_factory_.GetWeakPtr();
 }
 
 }  // namespace media