Make MediaPlayerEventRouter a PKS to decouple it from ExtensionService

chrome/browser/chromeos/extensions/media_player_event_router.cc

Index: chrome/browser/chromeos/extensions/media_player_event_router.cc
diff --git a/chrome/browser/chromeos/extensions/media_player_event_router.cc b/chrome/browser/chromeos/extensions/media_player_event_router.cc
index 667a02bed9a5f33c014c1d6ddcb6efdcfe6f2df0..619535c28f8be3c589a9011e921355149dea1297 100644
--- a/chrome/browser/chromeos/extensions/media_player_event_router.cc
+++ b/chrome/browser/chromeos/extensions/media_player_event_router.cc
@@ -9,6 +9,8 @@
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 
+namespace extensions {
+
 static void BroadcastEvent(Profile* profile, const std::string& event_name) {
   if (profile && extensions::ExtensionSystem::Get(profile)->event_router()) {
     scoped_ptr<ListValue> args(new ListValue());
@@ -19,31 +21,27 @@ static void BroadcastEvent(Profile* profile, const std::string& event_name) {
   }
 }
 
-ExtensionMediaPlayerEventRouter::ExtensionMediaPlayerEventRouter()
-    : profile_(NULL) {
-}
-
-ExtensionMediaPlayerEventRouter*
-    ExtensionMediaPlayerEventRouter::GetInstance() {
-  return Singleton<ExtensionMediaPlayerEventRouter>::get();
+MediaPlayerEventRouter::MediaPlayerEventRouter(Profile* profile)
+    : profile_(profile) {
 }
 
-void ExtensionMediaPlayerEventRouter::Init(Profile* profile) {
-  profile_ = profile;
+MediaPlayerEventRouter::~MediaPlayerEventRouter() {
 }
 
-void ExtensionMediaPlayerEventRouter::NotifyNextTrack() {
+void MediaPlayerEventRouter::NotifyNextTrack() {
   BroadcastEvent(profile_, "mediaPlayerPrivate.onNextTrack");
 }
 
-void ExtensionMediaPlayerEventRouter::NotifyPlaylistChanged() {
+void MediaPlayerEventRouter::NotifyPlaylistChanged() {
   BroadcastEvent(profile_, "mediaPlayerPrivate.onPlaylistChanged");
 }
 
-void ExtensionMediaPlayerEventRouter::NotifyPrevTrack() {
+void MediaPlayerEventRouter::NotifyPrevTrack() {
   BroadcastEvent(profile_, "mediaPlayerPrivate.onPrevTrack");
 }
 
-void ExtensionMediaPlayerEventRouter::NotifyTogglePlayState() {
+void MediaPlayerEventRouter::NotifyTogglePlayState() {
   BroadcastEvent(profile_, "mediaPlayerPrivate.onTogglePlayState");
 }
+
+}  // namespace extensions