Upstream Chrome for Android Cast.

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 "base/android/scoped_java_ref.h"
 #include "base/command_line.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/android/media_players_observer.h"
@@ skipping 29 matching lines @@
 // Threshold on the number of media players per renderer before we start
 // attempting to release inactive media players.
 const int kMediaPlayerThreshold = 1;
 const int kInvalidMediaPlayerId = -1;
 
 static BrowserMediaPlayerManager::Factory g_factory = NULL;
 static media::MediaUrlInterceptor* media_url_interceptor_ = NULL;
 
 // static
 void BrowserMediaPlayerManager::RegisterFactory(Factory factory) {
-  g_factory = factory;
+  // TODO(aberent) nullptr test is a temporary fix to simplify upstreaming Cast.
+  // Until Cast is fully upstreamed we want the downstream factory to take
+  // priority over the upstream factory. The downstream call happens first,
+  // so this will ensure that it does.
+  if (g_factory == nullptr)
+    g_factory = factory;
 }
 
 // static
 void BrowserMediaPlayerManager::RegisterMediaUrlInterceptor(
     media::MediaUrlInterceptor* media_url_interceptor) {
   media_url_interceptor_ = media_url_interceptor;
 }
 
 // static
 BrowserMediaPlayerManager* BrowserMediaPlayerManager::Create(
@@ skipping 534 matching lines @@
     external_video_surface_container_->ReleaseExternalVideoSurface(player_id);
 #endif  // defined(VIDEO_HOLE)
 }
 
 void BrowserMediaPlayerManager::ReleasePlayer(MediaPlayerAndroid* player) {
   player->Release();
   ReleaseMediaResources(player->player_id());
 }
 
 }  // namespace content