Make MediaPlayerEventRouter a PKS to decouple it from ExtensionService

chrome/browser/chromeos/media/media_player.cc

Index: chrome/browser/chromeos/media/media_player.cc
diff --git a/chrome/browser/chromeos/media/media_player.cc b/chrome/browser/chromeos/media/media_player.cc
index 5306e6d97c2d54816f03f4015869ae5e47f261d2..47b2b9104aa3c8e1f87219f1553a1c08fe58c0b6 100644
--- a/chrome/browser/chromeos/media/media_player.cc
+++ b/chrome/browser/chromeos/media/media_player.cc
@@ -9,7 +9,6 @@
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "chrome/browser/chromeos/extensions/file_manager_util.h"
-#include "chrome/browser/chromeos/extensions/media_player_event_router.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
@@ -22,6 +21,11 @@
 #include "content/public/browser/web_contents.h"
 #include "ui/gfx/screen.h"
 
+#if defined(FILE_MANAGER_EXTENSION)
+#include "chrome/browser/chromeos/extensions/media_player_api.h"
+#include "chrome/browser/chromeos/extensions/media_player_event_router.h"
+#endif
+
 using content::BrowserThread;
 
 namespace {
@@ -110,7 +114,15 @@ void MediaPlayer::SetPlaylistPosition(int position) {
 }
 
 void MediaPlayer::NotifyPlaylistChanged() {
-  ExtensionMediaPlayerEventRouter::GetInstance()->NotifyPlaylistChanged();
+#if defined(FILE_MANAGER_EXTENSION)
+  Browser* browser = GetBrowser();
+  if (browser) {
+    extensions::MediaPlayerAPI::Get(browser->profile())->
+        media_player_event_router()->NotifyPlaylistChanged();
+  } else {
+    // How do we handle this case??

[Yoyo Zhou, 2012/12/20 22:45:20]

Probably okay to let this notification drop on the floor. (Do nothing.)

[Joe Thomas, 2012/12/20 23:20:28]

Done.

+  }
+#endif
 }
 
 void MediaPlayer::PopupMediaPlayer() {