Make MediaPlayerEventRouter a PKS to decouple it from ExtensionService

chrome/browser/ui/ash/chrome_shell_delegate.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/ui/ash/chrome_shell_delegate.h"
 
 #include "ash/host/root_window_host_factory.h"
 #include "ash/launcher/launcher_types.h"
 #include "ash/magnifier/magnifier_constants.h"
 #include "ash/system/tray/system_tray_delegate.h"
@@ skipping 32 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "grit/generated_resources.h"
 #include "ui/aura/client/user_action_client.h"
 #include "ui/aura/window.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/keyboard_overlay/keyboard_overlay_view.h"
 #include "base/chromeos/chromeos_version.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h"
+#include "chrome/browser/chromeos/extensions/media_player_api.h"
 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/webui_login_display_host.h"
 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_manager_client.h"
@@ skipping 422 matching lines @@
       break;
     case ash::UMA_ACCEL_KEYBOARD_BRIGHTNESS_UP_F7:
       content::RecordAction(
           content::UserMetricsAction("Accel_KeyboardBrightnessUp_F7"));
       break;
   }
 }
 
 void ChromeShellDelegate::HandleMediaNextTrack() {
 #if defined(OS_CHROMEOS)
-  ExtensionMediaPlayerEventRouter::GetInstance()->NotifyNextTrack();
+  extensions::MediaPlayerAPI::Get(GetTargetBrowser()->profile())->
+      media_player_event_router()->NotifyNextTrack();
 #endif
 }
 
 void ChromeShellDelegate::HandleMediaPlayPause() {
 #if defined(OS_CHROMEOS)
-  ExtensionMediaPlayerEventRouter::GetInstance()->NotifyTogglePlayState();
+  extensions::MediaPlayerAPI::Get(GetTargetBrowser()->profile())->
+      media_player_event_router()->NotifyTogglePlayState();
 #endif
 }
 
 void ChromeShellDelegate::HandleMediaPrevTrack() {
 #if defined(OS_CHROMEOS)
-  ExtensionMediaPlayerEventRouter::GetInstance()->NotifyPrevTrack();
+  extensions::MediaPlayerAPI::Get(GetTargetBrowser()->profile())->
+      media_player_event_router()->NotifyPrevTrack();
 #endif
 }
 
 string16 ChromeShellDelegate::GetTimeRemainingString(base::TimeDelta delta) {
   return TimeFormat::TimeRemainingLong(delta);
 }
 
 string16 ChromeShellDelegate::GetTimeDurationLongString(base::TimeDelta delta) {
   return TimeFormat::TimeDurationLong(delta);
 }
@@ skipping 39 matching lines @@
       ash::Shell::GetInstance()->ShowLauncher();
       break;
     default:
       NOTREACHED() << "Unexpected notification " << type;
   }
 #else
   // MSVC++ warns about switch statements without any cases.
   NOTREACHED() << "Unexpected notification " << type;
 #endif
 }