Cut reference from MountedDiskMonitor to DiskMountManager.

chrome/browser/chromeos/file_manager/volume_manager.cc

 // Copyright 2013 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/file_manager/volume_manager.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 236 matching lines @@
 
 VolumeManager::VolumeManager(
     Profile* profile,
     drive::DriveIntegrationService* drive_integration_service,
     chromeos::PowerManagerClient* power_manager_client,
     chromeos::disks::DiskMountManager* disk_mount_manager,
     chromeos::file_system_provider::Service* file_system_provider_service)
     : profile_(profile),
       drive_integration_service_(drive_integration_service),
       disk_mount_manager_(disk_mount_manager),
-      mounted_disk_monitor_(
-          new MountedDiskMonitor(power_manager_client, disk_mount_manager)),
+      mounted_disk_monitor_(new MountedDiskMonitor(power_manager_client)),
       file_system_provider_service_(file_system_provider_service),
       snapshot_manager_(new SnapshotManager(profile_)),
       weak_ptr_factory_(this) {
   DCHECK(disk_mount_manager);
 }
 
 VolumeManager::~VolumeManager() {
 }
 
 VolumeManager* VolumeManager::Get(content::BrowserContext* context) {
@@ skipping 229 matching lines @@
 
   VolumeInfo volume_info = CreateDriveVolumeInfo(profile_);
   DoUnmountEvent(chromeos::MOUNT_ERROR_NONE, volume_info);
 }
 
 void VolumeManager::OnDiskEvent(
     chromeos::disks::DiskMountManager::DiskEvent event,
     const chromeos::disks::DiskMountManager::Disk* disk) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
 
+  mounted_disk_monitor_->OnDiskEvent(event, disk);
+
   // Disregard hidden devices.
   if (disk->is_hidden())
     return;
 
   switch (event) {
     case chromeos::disks::DiskMountManager::DISK_ADDED:
     case chromeos::disks::DiskMountManager::DISK_CHANGED: {
       if (disk->device_path().empty()) {
         DVLOG(1) << "Empty system path for " << disk->device_path();
         return;
@@ skipping 40 matching lines @@
       }
       return;
   }
   NOTREACHED();
 }
 
 void VolumeManager::OnDeviceEvent(
     chromeos::disks::DiskMountManager::DeviceEvent event,
     const std::string& device_path) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
+
+  mounted_disk_monitor_->OnDeviceEvent(event, device_path);
+
   DVLOG(1) << "OnDeviceEvent: " << event << ", " << device_path;
-
   switch (event) {
     case chromeos::disks::DiskMountManager::DEVICE_ADDED:
       FOR_EACH_OBSERVER(VolumeManagerObserver, observers_,
                         OnDeviceAdded(device_path));
       return;
     case chromeos::disks::DiskMountManager::DEVICE_REMOVED: {
       FOR_EACH_OBSERVER(
           VolumeManagerObserver, observers_, OnDeviceRemoved(device_path));
       return;
     }
     case chromeos::disks::DiskMountManager::DEVICE_SCANNED:
       DVLOG(1) << "Ignore SCANNED event: " << device_path;
       return;
   }
   NOTREACHED();
 }
 
 void VolumeManager::OnMountEvent(
     chromeos::disks::DiskMountManager::MountEvent event,
     chromeos::MountError error_code,
     const chromeos::disks::DiskMountManager::MountPointInfo& mount_info) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK_NE(chromeos::MOUNT_TYPE_INVALID, mount_info.mount_type);
 
+  const chromeos::disks::DiskMountManager::Disk* disk =
+      disk_mount_manager_->FindDiskBySourcePath(mount_info.source_path);
+  mounted_disk_monitor_->OnMountEvent(event, error_code, mount_info, disk);
+
   if (mount_info.mount_type == chromeos::MOUNT_TYPE_ARCHIVE) {
     // If the file is not mounted now, tell it to drive file system so that
     // it can handle file caching correctly.
     // Note that drive file system knows if the file is managed by drive file
     // system or not, so here we report all paths.
     if ((event == chromeos::disks::DiskMountManager::MOUNTING &&
          error_code != chromeos::MOUNT_ERROR_NONE) ||
         (event == chromeos::disks::DiskMountManager::UNMOUNTING &&
          error_code == chromeos::MOUNT_ERROR_NONE)) {
       drive::FileSystemInterface* file_system =
           drive::util::GetFileSystemByProfile(profile_);
       if (file_system) {
         file_system->MarkCacheFileAsUnmounted(
             base::FilePath(mount_info.source_path),
             base::Bind(&drive::util::EmptyFileOperationCallback));
       }
     }
   }
 
   // Notify a mounting/unmounting event to observers.
-  const chromeos::disks::DiskMountManager::Disk* disk =
-      disk_mount_manager_->FindDiskBySourcePath(mount_info.source_path);
   VolumeInfo volume_info =
       CreateVolumeInfoFromMountPointInfo(mount_info, disk);
   switch (event) {
     case chromeos::disks::DiskMountManager::MOUNTING: {
       bool is_remounting =
           disk && mounted_disk_monitor_->DiskIsRemounting(*disk);
       DoMountEvent(error_code, volume_info, is_remounting);
       return;
     }
     case chromeos::disks::DiskMountManager::UNMOUNTING:
@@ skipping 213 matching lines @@
     return;
   if (error_code == chromeos::MOUNT_ERROR_NONE)
     mounted_volumes_.erase(volume_info.volume_id);
 
   FOR_EACH_OBSERVER(VolumeManagerObserver,
                     observers_,
                     OnVolumeUnmounted(error_code, volume_info));
 }
 
 }  // namespace file_manager