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

content/browser/android/media_player_manager_impl.cc

 // Copyright (c) 2012 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/android/media_player_manager_impl.h"
 
 #include "content/browser/android/media_resource_getter_impl.h"
 #include "content/browser/web_contents/web_contents_view_android.h"
 #include "content/common/media/media_player_messages_android.h"
 #include "content/public/browser/browser_context.h"
@@ skipping 111 matching lines @@
     player->SetVideoSurface(surface);
     Send(new MediaPlayerMsg_DidEnterFullscreen(
         routing_id(), player->player_id()));
   }
 }
 
 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));
 }
 
 media::MediaResourceGetter* MediaPlayerManagerImpl::GetMediaResourceGetter() {
   if (!media_resource_getter_.get()) {
     RenderProcessHost* host = render_view_host()->GetProcess();
     BrowserContext* context = host->GetBrowserContext();
     StoragePartition* partition = host->GetStoragePartition();
     fileapi::FileSystemContext* file_system_context =
@@ skipping 42 matching lines @@
 void MediaPlayerManagerImpl::OnReleaseResources(int player_id) {
   MediaPlayerAndroid* player = GetPlayer(player_id);
   // Don't release the fullscreen player when tab visibility changes,
   // it will be released when user hit the back/home button or when
   // OnDestroyPlayer is called.
   if (player && player_id != fullscreen_player_id_)
     player->Release();
 }
 
 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;
 }
 
 void MediaPlayerManagerImpl::DestroyAllMediaPlayers() {
   players_.clear();
   if (fullscreen_player_id_ != -1) {
     video_view_.DestroyContentVideoView();
     fullscreen_player_id_ = -1;
   }
@@ skipping 163 matching lines @@
           routing_id(), (*it)->player_id()));
     }
   }
 }
 
 void MediaPlayerManagerImpl::ReleaseMediaResources(
     MediaPlayerAndroid* player) {
   // 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