[fsp] Add requestUnmount() method together with the request manager.

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/callback.h"
 #include "base/command_line.h"
@@ skipping 189 matching lines @@
 
 VolumeInfo CreateProvidedFileSystemVolumeInfo(
     const chromeos::file_system_provider::ProvidedFileSystem& file_system) {
   VolumeInfo volume_info;
   volume_info.type = VOLUME_TYPE_PROVIDED;
   volume_info.mount_path = file_system.mount_path();
   volume_info.mount_condition = chromeos::disks::MOUNT_CONDITION_NONE;
   volume_info.is_parent = true;
   volume_info.is_read_only = true;
   volume_info.volume_id = GenerateVolumeId(volume_info);
+  volume_info.file_system_id = file_system.file_system_id();
   return volume_info;
 }
 
 }  // namespace
 
-VolumeInfo::VolumeInfo() {
-}
+VolumeInfo::VolumeInfo()
+    : file_system_id(0),
+      type(VOLUME_TYPE_GOOGLE_DRIVE),
+      mount_condition(chromeos::disks::MOUNT_CONDITION_NONE),
+      is_parent(false),
+      is_read_only(false) {}
 
 VolumeInfo::~VolumeInfo() {
 }
 
 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)
@@ skipping 58 matching lines @@
   // Subscribe to DiskMountManager.
   disk_mount_manager_->AddObserver(this);
 
   // Subscribe to FileSystemProviderService and register currently mounted
   // volumes for the profile.
   if (file_system_provider_service_) {
     using chromeos::file_system_provider::ProvidedFileSystem;
     file_system_provider_service_->AddObserver(this);
 
     std::vector<ProvidedFileSystem> provided_file_systems =
-        file_system_provider_service_->GetRegisteredFileSystems();
+        file_system_provider_service_->GetMountedFileSystems();
     for (size_t i = 0; i < provided_file_systems.size(); ++i) {
       VolumeInfo volume_info =
           CreateProvidedFileSystemVolumeInfo(provided_file_systems[i]);
       DoMountEvent(chromeos::MOUNT_ERROR_NONE, volume_info, kNotRemounting);
     }
   }
 
   std::vector<VolumeInfo> archives;
 
   const chromeos::disks::DiskMountManager::MountPointMap& mount_points =
@@ skipping 302 matching lines @@
       FOR_EACH_OBSERVER(
           VolumeManagerObserver, observers_,
           OnFormatCompleted(device_path,
                             error_code == chromeos::FORMAT_ERROR_NONE));
 
       return;
   }
   NOTREACHED();
 }
 
-void VolumeManager::OnProvidedFileSystemRegistered(
-    const chromeos::file_system_provider::ProvidedFileSystem& file_system) {
+void VolumeManager::OnProvidedFileSystemMount(
+    const chromeos::file_system_provider::ProvidedFileSystem& file_system,
+    base::File::Error error) {
   VolumeInfo volume_info = CreateProvidedFileSystemVolumeInfo(file_system);
-  DoMountEvent(chromeos::MOUNT_ERROR_NONE, volume_info, false /* remounting */);
+  // TODO(mtomasz): Introduce own type, and avoid using MountError internally,
+  // since it is related to cros disks only.
+  const chromeos::MountError mount_error = error == base::File::FILE_OK
+                                               ? chromeos::MOUNT_ERROR_NONE
+                                               : chromeos::MOUNT_ERROR_UNKNOWN;
+  DoMountEvent(mount_error, volume_info, false /* remounting */);
 }
 
-void VolumeManager::OnProvidedFileSystemUnregistered(
-    const chromeos::file_system_provider::ProvidedFileSystem& file_system) {
+void VolumeManager::OnProvidedFileSystemUnmount(
+    const chromeos::file_system_provider::ProvidedFileSystem& file_system,
+    base::File::Error error) {
+  // TODO(mtomasz): Introduce own type, and avoid using MountError internally,
+  // since it is related to cros disks only.
+  const chromeos::MountError mount_error = error == base::File::FILE_OK
+                                               ? chromeos::MOUNT_ERROR_NONE
+                                               : chromeos::MOUNT_ERROR_UNKNOWN;
   VolumeInfo volume_info = CreateProvidedFileSystemVolumeInfo(file_system);
-  DoUnmountEvent(chromeos::MOUNT_ERROR_NONE, volume_info);
+  DoUnmountEvent(mount_error, volume_info);
 }
 
 void VolumeManager::OnExternalStorageDisabledChanged() {
   // If the policy just got disabled we have to unmount every device currently
   // mounted. The opposite is fine - we can let the user re-plug her device to
   // make it available.
   if (profile_->GetPrefs()->GetBoolean(prefs::kExternalStorageDisabled)) {
     // We do not iterate on mount_points directly, because mount_points can
     // be changed by UnmountPath().
     // TODO(hidehiko): Is it necessary to unmount mounted archives, too, here?
@@ skipping 59 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