Cut reference from MountedDiskMonitor to DiskMountManager.

chrome/browser/chromeos/file_manager/mounted_disk_monitor.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/mounted_disk_monitor.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop_proxy.h"
 #include "chromeos/dbus/power_manager_client.h"
 
 using chromeos::disks::DiskMountManager;
 
 namespace file_manager {
 namespace {
 
 // Time span of the resuming process. All unmount events sent during this
 // time are considered as being part of remounting process, since remounting
 // is done just after resuming.
 const base::TimeDelta kResumingTimeSpan = base::TimeDelta::FromSeconds(5);
 
 }  // namespace
 
 MountedDiskMonitor::MountedDiskMonitor(
-    chromeos::PowerManagerClient* power_manager_client,
-    chromeos::disks::DiskMountManager* disk_mount_manager)
+    chromeos::PowerManagerClient* power_manager_client)
     : power_manager_client_(power_manager_client),
-      disk_mount_manager_(disk_mount_manager),
       is_resuming_(false),
       resuming_time_span_(kResumingTimeSpan),
       weak_factory_(this) {
   DCHECK(power_manager_client_);
-  DCHECK(disk_mount_manager_);
   power_manager_client_->AddObserver(this);
-  disk_mount_manager_->AddObserver(this);
-  disk_mount_manager_->RequestMountInfoRefresh();
 }
 
 MountedDiskMonitor::~MountedDiskMonitor() {
-  disk_mount_manager_->RemoveObserver(this);
   power_manager_client_->RemoveObserver(this);
 }
 
 void MountedDiskMonitor::SuspendImminent() {
   // Flip the resuming flag while suspending, so it is possible to detect
   // resuming as soon as possible after the lid is open. Note, that mount
   // events may occur before the SuspendDone method is called.
   is_resuming_ = true;
   weak_factory_.InvalidateWeakPtrs();
 }
@@ skipping 22 matching lines @@
 }
 
 void MountedDiskMonitor::MarkAsHardUnpluggedReported(
     const std::string& device_path) {
   hard_unplugged_[device_path] = HARD_UNPLUGGED_AND_REPORTED;
 }
 
 void MountedDiskMonitor::OnMountEvent(
     chromeos::disks::DiskMountManager::MountEvent event,
     chromeos::MountError error_code,
-    const chromeos::disks::DiskMountManager::MountPointInfo& mount_info) {
+    const chromeos::disks::DiskMountManager::MountPointInfo& mount_info,
+    const DiskMountManager::Disk* disk) {
   if (mount_info.mount_type != chromeos::MOUNT_TYPE_DEVICE)
     return;
 
   switch (event) {
     case DiskMountManager::MOUNTING: {
-      const DiskMountManager::Disk* disk =
-          disk_mount_manager_->FindDiskBySourcePath(mount_info.source_path);
       if (!disk || error_code != chromeos::MOUNT_ERROR_NONE)
         return;
       mounted_disks_[mount_info.source_path] = disk->fs_uuid();
       break;
     }
 
     case DiskMountManager::UNMOUNTING: {
       DiskMap::iterator it = mounted_disks_.find(mount_info.source_path);
       if (it == mounted_disks_.end())
         return;
@@ skipping 25 matching lines @@
     chromeos::disks::DiskMountManager::DeviceEvent event,
     const std::string& device_path) {
   if (event == chromeos::disks::DiskMountManager::DEVICE_REMOVED) {
     const std::map<std::string, HardUnpluggedState>::iterator it
         = hard_unplugged_.find(device_path);
     if (it != hard_unplugged_.end())
       hard_unplugged_.erase(it);
   }
 }
 
-void MountedDiskMonitor::OnFormatEvent(
-    chromeos::disks::DiskMountManager::FormatEvent event,
-    chromeos::FormatError error_code,
-    const std::string& device_path) {
-}
-
 void MountedDiskMonitor::Reset() {
   unmounted_while_resuming_.clear();
   is_resuming_ = false;
 }
 
 }  // namespace file_manager