Extract OnDiskEvent and OnFormatEvent logic part from EventRouter to VolumeManager.

chrome/browser/chromeos/extensions/file_manager/event_router.h

 // Copyright (c) 2012 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_MANAGER_EVENT_ROUTER_H_
 #define CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_EVENT_ROUTER_H_
 
 #include <map>
 #include <string>
 
@@ skipping 88 matching lines @@
 
   // drive::FileSystemObserver overrides.
   virtual void OnDirectoryChanged(
       const base::FilePath& directory_path) OVERRIDE;
 
   // drive::DriveIntegrationServiceObserver overrides.
   virtual void OnFileSystemMounted() OVERRIDE;
   virtual void OnFileSystemBeingUnmounted() OVERRIDE;
 
   // VolumeManagerObserver overrides.
+  virtual void OnDiskAdded(
+      const chromeos::disks::DiskMountManager::Disk& disk,
+      bool mounting) OVERRIDE;
+  virtual void OnDiskRemoved(
+      const chromeos::disks::DiskMountManager::Disk& disk) OVERRIDE;
   virtual void OnDeviceAdded(const std::string& device_path) OVERRIDE;
   virtual void OnDeviceRemoved(const std::string& device_path) OVERRIDE;
+  virtual void OnFormatStarted(
+      const std::string& device_path, bool success) OVERRIDE;
+  virtual void OnFormatCompleted(
+      const std::string& device_path, bool success) OVERRIDE;
 
  private:
   typedef std::map<base::FilePath, FileWatcher*> WatcherMap;
 
   // USB mount event handlers.
-  void OnDiskAdded(const chromeos::disks::DiskMountManager::Disk* disk);
-  void OnDiskRemoved(const chromeos::disks::DiskMountManager::Disk* disk);
   void OnDiskMounted(const chromeos::disks::DiskMountManager::Disk* disk);
   void OnDiskUnmounted(const chromeos::disks::DiskMountManager::Disk* disk);
-  void OnFormatStarted(const std::string& device_path, bool success);
-  void OnFormatCompleted(const std::string& device_path, bool success);
 
   // Called on change to kExternalStorageDisabled pref.
   void OnExternalStorageDisabledChanged();
 
   // Called when prefs related to file manager change.
   void OnFileManagerPrefsChanged();
 
   // Process file watch notifications.
   void HandleFileWatchNotification(const base::FilePath& path,
                                    bool got_error);
@@ skipping 40 matching lines @@
 
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate the weak pointers before any other members are destroyed.
   base::WeakPtrFactory<EventRouter> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(EventRouter);
 };
 
 }  // namespace file_manager
 
 #endif  // CHROME_BROWSER_CHROMEOS_EXTENSIONS_FILE_MANAGER_EVENT_ROUTER_H_