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..988d5e322cdeedc328d3075c16b8b8b0eb5521fa 100644
--- a/chrome/browser/chromeos/extensions/file_browser_event_router.cc
+++ b/chrome/browser/chromeos/extensions/file_browser_event_router.cc
@@ -47,18 +47,10 @@ DictionaryValue* DiskToDictionaryValue(
   return result;
 }
 
-ExtensionFileBrowserEventRouter::ExtensionFileBrowserEventRouter()
-    : profile_(NULL) {
-}
-
-ExtensionFileBrowserEventRouter::~ExtensionFileBrowserEventRouter() {
-}
-
-void ExtensionFileBrowserEventRouter::ObserveFileSystemEvents(
-    Profile* profile) {
-  if (!profile)
-    return;
-  profile_ = profile;
+ExtensionFileBrowserEventRouter::ExtensionFileBrowserEventRouter(
+    Profile* profile)
+    : profile_(profile) {
+  DCHECK(profile);
   if (!chromeos::CrosLibrary::Get()->EnsureLoaded())
     return;
   if (chromeos::UserManager::Get()->user_is_logged_in()) {
@@ -70,7 +62,7 @@ void ExtensionFileBrowserEventRouter::ObserveFileSystemEvents(
   }

[asargent_no_longer_on_chrome, 2011/05/24 18:18:00]

nit: I think this code block should be moved into an Init method as well. 

[Yoyo Zhou, 2011/05/24 19:17:55]

Done.

 }
 
-void ExtensionFileBrowserEventRouter::StopObservingFileSystemEvents() {
+ExtensionFileBrowserEventRouter::~ExtensionFileBrowserEventRouter() {
   if (!profile_)
     return;
   if (!chromeos::CrosLibrary::Get()->EnsureLoaded())
@@ -81,12 +73,6 @@ void ExtensionFileBrowserEventRouter::StopObservingFileSystemEvents() {
   profile_ = NULL;
 }
 
-// static
-ExtensionFileBrowserEventRouter*
-    ExtensionFileBrowserEventRouter::GetInstance() {
-  return Singleton<ExtensionFileBrowserEventRouter>::get();
-}
-
 void ExtensionFileBrowserEventRouter::DiskChanged(
     chromeos::MountLibraryEventType event,
     const chromeos::MountLibrary::Disk* disk) {