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

chrome/browser/chromeos/extensions/file_browser_event_router.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_EVENT_ROUTER_H_
 #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_EVENT_ROUTER_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 10 matching lines @@
 
 namespace chromeos {
 class SystemNotification;
 }
 
 // Used to monitor disk mount changes and signal when new mounted usb device is
 // found.
 class ExtensionFileBrowserEventRouter
     : public chromeos::MountLibrary::Observer {
  public:
-  static ExtensionFileBrowserEventRouter* GetInstance();
+  explicit ExtensionFileBrowserEventRouter(Profile* profile);
+  virtual ~ExtensionFileBrowserEventRouter();
 
-  // Starts/stops observing file system change events. Currently only
-  // MountLibrary events are being observed.
-  void ObserveFileSystemEvents(Profile* profile);
-  void StopObservingFileSystemEvents();
+  void Init();
 
   // File watch setup routines.
   bool AddFileWatch(const FilePath& file_path,
                     const FilePath& virtual_path,
                     const std::string& extension_id);
   void RemoveFileWatch(const FilePath& file_path,
                        const std::string& extension_id);
 
   // MountLibrary::Observer overrides.
   virtual void DiskChanged(chromeos::MountLibraryEventType event,
                            const chromeos::MountLibrary::Disk* disk);
   virtual void DeviceChanged(chromeos::MountLibraryEventType event,
                              const std::string& device_path);
 
  private:
-  friend struct DefaultSingletonTraits<ExtensionFileBrowserEventRouter>;
   typedef std::map<std::string, linked_ptr<chromeos::SystemNotification> >
       NotificationMap;
   typedef std::map<std::string, std::string> MountPointMap;
   typedef struct FileWatcherExtensions {
     FileWatcherExtensions(const FilePath& path, const std::string& extension_id) {
       file_watcher.reset(new base::files::FilePathWatcher());
       virtual_path = path;
       extensions.insert(extension_id);
     }
     ~FileWatcherExtensions() {}
@@ skipping 10 matching lines @@
     FileWatcherDelegate();
 
    private:
     // base::files::FilePathWatcher::Delegate overrides.
     virtual void OnFilePathChanged(const FilePath& path) OVERRIDE;
     virtual void OnFilePathError(const FilePath& path) OVERRIDE;
 
     void HandleFileWatchOnUIThread(const FilePath& local_path, bool got_error);
   };
 
-  ExtensionFileBrowserEventRouter();
-  virtual ~ExtensionFileBrowserEventRouter();
-
   // USB mount event handlers.
   void OnDiskAdded(const chromeos::MountLibrary::Disk* disk);
   void OnDiskRemoved(const chromeos::MountLibrary::Disk* disk);
   void OnDiskChanged(const chromeos::MountLibrary::Disk* disk);
   void OnDeviceAdded(const std::string& device_path);
   void OnDeviceRemoved(const std::string& device_path);
   void OnDeviceScanned(const std::string& device_path);
 
   // Finds first notifications corresponding to the same device. Ensures that
   // we don't pop up multiple notifications for the same device.
@@ skipping 28 matching lines @@
   MountPointMap mounted_devices_;
   NotificationMap notifications_;
   WatcherMap file_watchers_;
   Profile* profile_;
   base::Lock lock_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionFileBrowserEventRouter);
 };
 
 #endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_BROWSER_EVENT_ROUTER_H_