Make MediaPlayerEventRouter a PKS to decouple it from ExtensionService

chrome/browser/extensions/extension_function_registry.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 "chrome/browser/extensions/extension_function_registry.h"
 
 #include "chrome/browser/accessibility/accessibility_extension_api.h"
 #include "chrome/browser/extensions/api/app/app_api.h"
 #include "chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.h"
 #include "chrome/browser/extensions/api/bookmarks/bookmark_api.h"
@@ skipping 44 matching lines @@
 
 #if defined(TOOLKIT_VIEWS)
 #include "chrome/browser/extensions/api/input/input.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/extensions/echo_private_api.h"
 #include "chrome/browser/chromeos/extensions/file_browser_handler_api.h"
 #include "chrome/browser/chromeos/extensions/info_private_api.h"
 #include "chrome/browser/chromeos/extensions/input_method_api.h"
+#include "chrome/browser/chromeos/extensions/media_player_api.h"
 #include "chrome/browser/chromeos/extensions/power/power_api.h"
 #include "chrome/browser/chromeos/extensions/wallpaper_private_api.h"
-#include "chrome/browser/chromeos/media/media_player_extension_api.h"
 #include "chrome/browser/extensions/api/terminal/terminal_private_api.h"
 #endif
 
 // static
 ExtensionFunctionRegistry* ExtensionFunctionRegistry::GetInstance() {
   return Singleton<ExtensionFunctionRegistry>::get();
 }
 
 ExtensionFunctionRegistry::ExtensionFunctionRegistry() {
   ResetFunctions();
@@ skipping 252 matching lines @@
 
   // ChromeOS-specific part of the API.
 #if defined(OS_CHROMEOS)
   // Device Customization.
   RegisterFunction<extensions::GetChromeosInfoFunction>();
 
   // FileBrowserHandlerInternal.
   RegisterFunction<FileHandlerSelectFileFunction>();
 
   // Mediaplayer
-  RegisterFunction<PlayMediaplayerFunction>();
-  RegisterFunction<GetPlaylistMediaplayerFunction>();
-  RegisterFunction<SetWindowHeightMediaplayerFunction>();
-  RegisterFunction<CloseWindowMediaplayerFunction>();
+  RegisterFunction<extensions::PlayMediaplayerFunction>();
+  RegisterFunction<extensions::GetPlaylistMediaplayerFunction>();
+  RegisterFunction<extensions::SetWindowHeightMediaplayerFunction>();
+  RegisterFunction<extensions::CloseWindowMediaplayerFunction>();
 
   // WallpaperManagerPrivate functions.
   RegisterFunction<WallpaperStringsFunction>();
   RegisterFunction<WallpaperSetWallpaperIfExistFunction>();
   RegisterFunction<WallpaperSetWallpaperFunction>();
   RegisterFunction<WallpaperSetCustomWallpaperFunction>();
   RegisterFunction<WallpaperMinimizeInactiveWindowsFunction>();
   RegisterFunction<WallpaperRestoreMinimizedWindowsFunction>();
   RegisterFunction<WallpaperGetThumbnailFunction>();
   RegisterFunction<WallpaperSaveThumbnailFunction>();
@@ skipping 124 matching lines @@
 }
 
 ExtensionFunction* ExtensionFunctionRegistry::NewFunction(
     const std::string& name) {
   FactoryMap::iterator iter = factories_.find(name);
   DCHECK(iter != factories_.end());
   ExtensionFunction* function = iter->second();
   function->set_name(name);
   return function;
 }