Change event routers from singletons to being owned by the ExtensionService.

chrome/browser/chromeos/extensions/file_browser_event_router.cc

Index: chrome/browser/chromeos/extensions/file_browser_event_router.cc
diff --git a/chrome/browser/chromeos/extensions/file_browser_event_router.cc b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
index d5aef36fc0c73d199e8d79ee4ec9769e2155e91c..9e8f7e62f5eaa5857219b06dc4253343fc4871ec 100644
--- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
@@ -47,18 +47,24 @@ DictionaryValue* DiskToDictionaryValue(
   return result;
 }
 
-ExtensionFileBrowserEventRouter::ExtensionFileBrowserEventRouter()
-    : profile_(NULL) {
+ExtensionFileBrowserEventRouter::ExtensionFileBrowserEventRouter(
+    Profile* profile)
+    : profile_(profile) {
+  DCHECK(profile);
 }
 
 ExtensionFileBrowserEventRouter::~ExtensionFileBrowserEventRouter() {
+  if (!profile_)
+    return;
+  if (!chromeos::CrosLibrary::Get()->EnsureLoaded())
+    return;
+  chromeos::MountLibrary* lib =
+      chromeos::CrosLibrary::Get()->GetMountLibrary();
+  lib->RemoveObserver(this);
+  profile_ = NULL;
 }
 
-void ExtensionFileBrowserEventRouter::ObserveFileSystemEvents(
-    Profile* profile) {
-  if (!profile)
-    return;
-  profile_ = profile;
+void ExtensionFileBrowserEventRouter::ObserveFileSystemEvents() {
   if (!chromeos::CrosLibrary::Get()->EnsureLoaded())
     return;
   if (chromeos::UserManager::Get()->user_is_logged_in()) {
@@ -70,23 +76,6 @@ void ExtensionFileBrowserEventRouter::ObserveFileSystemEvents(
   }
 }
 
-void ExtensionFileBrowserEventRouter::StopObservingFileSystemEvents() {
-  if (!profile_)
-    return;
-  if (!chromeos::CrosLibrary::Get()->EnsureLoaded())
-    return;
-  chromeos::MountLibrary* lib =
-      chromeos::CrosLibrary::Get()->GetMountLibrary();
-  lib->RemoveObserver(this);
-  profile_ = NULL;
-}
-
-// static
-ExtensionFileBrowserEventRouter*
-    ExtensionFileBrowserEventRouter::GetInstance() {
-  return Singleton<ExtensionFileBrowserEventRouter>::get();
-}
-
 void ExtensionFileBrowserEventRouter::DiskChanged(
     chromeos::MountLibraryEventType event,
     const chromeos::MountLibrary::Disk* disk) {