Revert of Added stub MediaSourcePlayer for developing behind the flag

content/browser/media/android/browser_media_player_manager.cc

Index: content/browser/media/android/browser_media_player_manager.cc
diff --git a/content/browser/media/android/browser_media_player_manager.cc b/content/browser/media/android/browser_media_player_manager.cc
index 68268f7406d215d98953787c36061d5b870c0f8f..20fd34e89de28e72e243f44ec986366dcabc57af 100644
--- a/content/browser/media/android/browser_media_player_manager.cc
+++ b/content/browser/media/android/browser_media_player_manager.cc
@@ -25,13 +25,11 @@
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.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_url_interceptor.h"
 #include "media/base/media_switches.h"
 
-using media::MediaCodecPlayer;
 using media::MediaPlayerAndroid;
 using media::MediaPlayerBridge;
 using media::MediaPlayerManager;
@@ -115,24 +113,13 @@
     }
 
     case MEDIA_PLAYER_TYPE_MEDIA_SOURCE: {
-      if (base::CommandLine::ForCurrentProcess()->
-          HasSwitch(switches::kEnableMediaThreadForMediaPlayback)) {
-        return new MediaCodecPlayer(
-            media_player_params.player_id,
-            manager,
-            base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesRequested,
-                       weak_ptr_factory_.GetWeakPtr()),
-            demuxer->CreateDemuxer(media_player_params.demuxer_client_id),
-            media_player_params.frame_url);
-      } else {
-        return new MediaSourcePlayer(
-            media_player_params.player_id,
-            manager,
-            base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesRequested,
-                       weak_ptr_factory_.GetWeakPtr()),
-            demuxer->CreateDemuxer(media_player_params.demuxer_client_id),
-            media_player_params.frame_url);
-      }
+      return new MediaSourcePlayer(
+          media_player_params.player_id,
+          manager,
+          base::Bind(&BrowserMediaPlayerManager::OnMediaResourcesRequested,
+                     weak_ptr_factory_.GetWeakPtr()),
+          demuxer->CreateDemuxer(media_player_params.demuxer_client_id),
+          media_player_params.frame_url);
     }
   }
 
@@ -156,11 +143,6 @@
   // (e.g. the WebContents may be destroyed before the render process). So
   // we cannot DCHECK(players_.empty()) here. Instead, all media players in
   // |players_| will be destroyed here because |player_| is a ScopedVector.
-
-  for (MediaPlayerAndroid* player : players_)
-    player->DeleteOnCorrectThread();
-
-  players_.weak_clear();
 }
 
 void BrowserMediaPlayerManager::ExitFullscreen(bool release_media_player) {
@@ -548,8 +530,7 @@
       it != players_.end(); ++it) {
     if ((*it)->player_id() == player_id) {
       ReleaseMediaResources(player_id);
-      (*it)->DeleteOnCorrectThread();
-      players_.weak_erase(it);
+      players_.erase(it);
       audio_monitor_->RemovePlayer(render_frame_host_, player_id);
       break;
     }