Change many extension event routers to not be singletons and to be more profile-aware.

chrome/browser/chromeos/extensions/file_browser_event_router.cc

 // Copyright (c) 2011 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/chromeos/extensions/file_browser_event_router.h"
 
 #include "base/json/json_writer.h"
 #include "base/memory/singleton.h"
 #include "base/stl_util-inl.h"
 #include "base/values.h"
@@ skipping 37 matching lines @@
   DictionaryValue* result = new DictionaryValue();
   result->SetString("mountPath", disk->mount_path());
   result->SetString("devicePath", disk->device_path());
   result->SetString("label", disk->device_label());
   result->SetString("deviceType", DeviceTypeToString(disk->device_type()));
   result->SetInteger("totalSizeKB", disk->total_size() / 1024);
   result->SetBoolean("readOnly", disk->is_read_only());
   return result;
 }
 
-ExtensionFileBrowserEventRouter::ExtensionFileBrowserEventRouter()
+ExtensionFileBrowserEventRouter::ExtensionFileBrowserEventRouter(
+    Profile* profile)
     : delegate_(new ExtensionFileBrowserEventRouter::FileWatcherDelegate()),
-      profile_(NULL) {
+      profile_(profile) {
 }
 
 ExtensionFileBrowserEventRouter::~ExtensionFileBrowserEventRouter() {
   DCHECK(file_watchers_.empty());
   STLDeleteValues(&file_watchers_);
 
   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::ObserveFileSystemEvents(
-    Profile* profile) {
-  if (!profile)
+void ExtensionFileBrowserEventRouter::Init() {
+  if (!profile_)

[asargent_no_longer_on_chrome, 2011/06/23 22:18:38]

Should we have NOTREACHED() or CHECK(false) here instead of ignoring it? 

[Yoyo Zhou, 2011/06/24 17:21:38]

Sure.

     return;
-  profile_ = profile;
   if (!chromeos::CrosLibrary::Get()->EnsureLoaded())
     return;
   if (chromeos::UserManager::Get()->user_is_logged_in()) {
     chromeos::MountLibrary* lib =
         chromeos::CrosLibrary::Get()->GetMountLibrary();
     lib->RemoveObserver(this);
     lib->AddObserver(this);
     lib->RequestMountInfoRefresh();
   }
 }
@@ skipping 28 matching lines @@
   if (iter == file_watchers_.end())
     return;
   // Remove the renderer process for this watch.
   iter->second->extensions.erase(extension_id);
   if (iter->second->extensions.empty()) {
     delete iter->second;
     file_watchers_.erase(iter);
   }
 }
 
-void ExtensionFileBrowserEventRouter::StopObservingFileSystemEvents() {
-  if (!profile_)
-    return;
-  if (!chromeos::CrosLibrary::Get()->EnsureLoaded())
-    return;
-  chromeos::MountLibrary* lib =
-      chromeos::CrosLibrary::Get()->GetMountLibrary();
-  lib->RemoveObserver(this);
-  profile_ = NULL;
-}
-
 void ExtensionFileBrowserEventRouter::DiskChanged(
     chromeos::MountLibraryEventType event,
     const chromeos::MountLibrary::Disk* disk) {
   if (event == chromeos::MOUNT_DISK_ADDED) {
     OnDiskAdded(disk);
   } else if (event == chromeos::MOUNT_DISK_REMOVED) {
     OnDiskRemoved(disk);
   } else if (event == chromeos::MOUNT_DISK_CHANGED) {
     OnDiskChanged(disk);
   }
@@ skipping 226 matching lines @@
           local_path,
           true));     // got_error
 }
 
 void
 ExtensionFileBrowserEventRouter::FileWatcherDelegate::HandleFileWatchOnUIThread(
      const FilePath& local_path, bool got_error) {
   ExtensionFileBrowserEventRouter::GetInstance()->HandleFileWatchNotification(
       local_path, got_error);
 }