1 files changed, 9 insertions, 14 deletions
diff --git a/content/browser/android/browser_media_player_manager.cc b/content/browser/android/browser_media_player_manager.cc
index cd4f764..31457f0 100644
--- a/content/browser/android/browser_media_player_manager.cc
+++ b/content/browser/android/browser_media_player_manager.cc
@@ -22,28 +22,23 @@ using media::MediaPlayerAndroid;
 // attempting to release inactive media players.
 static const int kMediaPlayerThreshold = 1;
 
-namespace media {
+namespace content {
 
-static MediaPlayerManager::FactoryFunction g_factory_function = NULL;
+static BrowserMediaPlayerManager::Factory g_factory = NULL;
 
 // static
-CONTENT_EXPORT void MediaPlayerManager::RegisterFactoryFunction(
-    FactoryFunction factory_function) {
-  g_factory_function = factory_function;
+void BrowserMediaPlayerManager::RegisterFactory(Factory factory) {
+  g_factory = factory;
 }
 
 // static
-media::MediaPlayerManager* MediaPlayerManager::Create(
-    content::RenderViewHost* render_view_host) {
-  if (g_factory_function)
-    return g_factory_function(render_view_host);
-  return new content::BrowserMediaPlayerManager(render_view_host);
+BrowserMediaPlayerManager* BrowserMediaPlayerManager::Create(
+    RenderViewHost* rvh) {
+  if (g_factory)
+    return g_factory(rvh);
+  return new BrowserMediaPlayerManager(rvh);
 }
 
-}  // namespace media
-
-namespace content {
-
 BrowserMediaPlayerManager::BrowserMediaPlayerManager(
     RenderViewHost* render_view_host)
     : RenderViewHostObserver(render_view_host),