Delete MediaCodecPlayer, it's time!

content/browser/media/android/browser_media_player_manager.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_media_player_manager.h"
 
 #include <utility>
 
 #include "base/android/scoped_java_ref.h"
 #include "base/memory/singleton.h"
@@ skipping 11 matching lines @@
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
 #include "gpu/ipc/common/android/surface_texture_peer.h"
-#include "media/base/android/media_codec_player.h"
 #include "media/base/android/media_player_bridge.h"
 #include "media/base/android/media_source_player.h"
-#include "media/base/android/media_task_runner.h"
 #include "media/base/android/media_url_interceptor.h"
 
 #if !defined(USE_AURA)
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
 #endif
 
-using media::MediaCodecPlayer;
 using media::MediaPlayerAndroid;
 using media::MediaPlayerBridge;
 using media::MediaPlayerManager;
 using media::MediaSourcePlayer;
 
 namespace content {
 
 namespace {
 
 class BrowserSurfaceTexturePeer : public gpu::SurfaceTexturePeer {
@@ skipping 181 matching lines @@
         // the page.
         OnMediaMetadataChanged(media_player_params.player_id, base::TimeDelta(),
                                0, 0, false);
       } else if (!should_block) {
         media_player_bridge->Initialize();
       }
       return media_player_bridge;
     }
 
     case MEDIA_PLAYER_TYPE_MEDIA_SOURCE: {
-      if (media::UseMediaThreadForMediaPlayback()) {
-        return new MediaCodecPlayer(
-            media_player_params.player_id, weak_ptr_factory_.GetWeakPtr(),
-            base::Bind(&BrowserMediaPlayerManager::OnDecoderResourcesReleased,
-                       weak_ptr_factory_.GetWeakPtr()),
-            demuxer->CreateDemuxer(media_player_params.demuxer_client_id),
-            media_player_params.frame_url,
-            media_player_params.media_session_id);
-      } else {
-        return new MediaSourcePlayer(
-            media_player_params.player_id, this,
-            base::Bind(&BrowserMediaPlayerManager::OnDecoderResourcesReleased,
-                       weak_ptr_factory_.GetWeakPtr()),
-            demuxer->CreateDemuxer(media_player_params.demuxer_client_id),
-            media_player_params.frame_url,
-            media_player_params.media_session_id);
-      }
+      return new MediaSourcePlayer(
+          media_player_params.player_id, this,
+          base::Bind(&BrowserMediaPlayerManager::OnDecoderResourcesReleased,
+                     weak_ptr_factory_.GetWeakPtr()),
+          demuxer->CreateDemuxer(media_player_params.demuxer_client_id),
+          media_player_params.frame_url, media_player_params.media_session_id);
     }
   }
 
   NOTREACHED();
   return NULL;
 }
 
 BrowserMediaPlayerManager::BrowserMediaPlayerManager(
     RenderFrameHost* render_frame_host)
     : render_frame_host_(render_frame_host),
@@ skipping 535 matching lines @@
   if (!player)
     return;
   player->Start();
   if (fullscreen_player_id_ == player_id && fullscreen_player_is_released_) {
     video_view_->OpenVideo();
     fullscreen_player_is_released_ = false;
   }
 }
 
 }  // namespace content