Allow some Android media player implementation to be overridden by embedders.

content/browser/android/media_player_manager_impl.cc

Index: content/browser/android/media_player_manager_impl.cc
diff --git a/content/browser/android/media_player_manager_impl.cc b/content/browser/android/media_player_manager_impl.cc
index a97250ecadc9918c8e3784afbbfd057194acb7de..7fb5e8f3d39374c87bd6640d52b9336b96af3457 100644
--- a/content/browser/android/media_player_manager_impl.cc
+++ b/content/browser/android/media_player_manager_impl.cc
@@ -127,16 +127,10 @@ void MediaPlayerManagerImpl::OnInitialize(
     int player_id, const GURL& url,
     bool is_media_source,
     const GURL& first_party_for_cookies) {
-  for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin();
-      it != players_.end(); ++it) {
-    if ((*it)->player_id() == player_id) {
-      players_.erase(it);
-      break;
-    }
-  }
+  RemovePlayer(player_id);
 
   RenderProcessHost* host = render_view_host()->GetProcess();
-  players_.push_back(media::MediaPlayerAndroid::Create(
+  AddPlayer(media::MediaPlayerAndroid::Create(
       player_id, url, is_media_source, first_party_for_cookies,
       host->GetBrowserContext()->IsOffTheRecord(), this));
 }
@@ -199,13 +193,7 @@ void MediaPlayerManagerImpl::OnReleaseResources(int player_id) {
 }
 
 void MediaPlayerManagerImpl::OnDestroyPlayer(int player_id) {
-  for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin();
-      it != players_.end(); ++it) {
-    if ((*it)->player_id() == player_id) {
-      players_.erase(it);
-      break;
-    }
-  }
+  RemovePlayer(player_id);
   if (fullscreen_player_id_ == player_id)
     fullscreen_player_id_ = -1;
 }
@@ -372,4 +360,19 @@ void MediaPlayerManagerImpl::ReleaseMediaResources(
   // Nothing needs to be done.
 }
 
+void MediaPlayerManagerImpl::AddPlayer(MediaPlayerAndroid* player) {
+  DCHECK(!GetPlayer(player->player_id()));
+  players_.push_back(player);
+}
+
+void MediaPlayerManagerImpl::RemovePlayer(int player_id) {
+  for (ScopedVector<MediaPlayerAndroid>::iterator it = players_.begin();
+      it != players_.end(); ++it) {
+    if ((*it)->player_id() == player_id) {
+      players_.erase(it);
+      break;
+    }
+  }
+}
+
 }  // namespace content