Move storage-related files from webkit/ to new top-level directory storage/

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 15 matching lines @@
 #include "chrome/browser/local_discovery/storage/privet_filesystem_constants.h"
 #include "chrome/browser/media_galleries/fileapi/mtp_device_map_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/disks/disk_mount_manager.h"
 #include "components/storage_monitor/storage_monitor.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
-#include "webkit/browser/fileapi/external_mount_points.h"
+#include "storage/browser/fileapi/external_mount_points.h"
 
 namespace file_manager {
 namespace {
 
 // A named constant to be passed to the |is_remounting| parameter.
 const bool kNotRemounting = false;
 
 const char kFileManagerMTPMountNamePrefix[] = "fileman-mtp-";
 const char kMtpVolumeIdPrefix [] = "mtp:";
 
 // Registers |path| as the "Downloads" folder to the FileSystem API backend.
 // If another folder is already mounted. It revokes and overrides the old one.
 bool RegisterDownloadsMountPoint(Profile* profile, const base::FilePath& path) {
   // Although we show only profile's own "Downloads" folder in Files.app,
   // in the backend we need to mount all profile's download directory globally.
   // Otherwise, Files.app cannot support cross-profile file copies, etc.
   // For this reason, we need to register to the global GetSystemInstance().
   const std::string mount_point_name =
       file_manager::util::GetDownloadsMountPointName(profile);
-  fileapi::ExternalMountPoints* const mount_points =
-      fileapi::ExternalMountPoints::GetSystemInstance();
+  storage::ExternalMountPoints* const mount_points =
+      storage::ExternalMountPoints::GetSystemInstance();
 
   // In some tests we want to override existing Downloads mount point, so we
   // first revoke the existing mount point (if any).
   mount_points->RevokeFileSystem(mount_point_name);
-  return mount_points->RegisterFileSystem(
-      mount_point_name, fileapi::kFileSystemTypeNativeLocal,
-      fileapi::FileSystemMountOption(), path);
+  return mount_points->RegisterFileSystem(mount_point_name,
+                                          storage::kFileSystemTypeNativeLocal,
+                                          storage::FileSystemMountOption(),
+                                          path);
 }
 
 // Finds the path register as the "Downloads" folder to FileSystem API backend.
 // Returns false if it is not registered.
 bool FindDownloadsMountPointPath(Profile* profile, base::FilePath* path) {
   const std::string mount_point_name =
       util::GetDownloadsMountPointName(profile);
-  fileapi::ExternalMountPoints* const mount_points =
-      fileapi::ExternalMountPoints::GetSystemInstance();
+  storage::ExternalMountPoints* const mount_points =
+      storage::ExternalMountPoints::GetSystemInstance();
 
   return mount_points->GetRegisteredPath(mount_point_name, path);
 }
 
 VolumeType MountTypeToVolumeType(chromeos::MountType type) {
   switch (type) {
     case chromeos::MOUNT_TYPE_INVALID:
       // We don't expect this value, but list here, so that when any value
       // is added to the enum definition but this is not edited, the compiler
       // warns it.
@@ skipping 605 matching lines @@
   const base::FilePath path = base::FilePath::FromUTF8Unsafe(info.location());
   const std::string fsid = GetMountPointNameForMediaStorage(info);
   const std::string base_name = base::UTF16ToUTF8(info.model_name());
 
   // Assign a fresh volume ID based on the volume name.
   std::string label = base_name;
   for (int i = 2; mounted_volumes_.count(kMtpVolumeIdPrefix + label); ++i)
     label = base_name + base::StringPrintf(" (%d)", i);
 
   bool result =
-      fileapi::ExternalMountPoints::GetSystemInstance()->RegisterFileSystem(
-          fsid, fileapi::kFileSystemTypeDeviceMediaAsFileStorage,
-          fileapi::FileSystemMountOption(), path);
+      storage::ExternalMountPoints::GetSystemInstance()->RegisterFileSystem(
+          fsid,
+          storage::kFileSystemTypeDeviceMediaAsFileStorage,
+          storage::FileSystemMountOption(),
+          path);
   DCHECK(result);
   content::BrowserThread::PostTask(
       content::BrowserThread::IO, FROM_HERE, base::Bind(
           &MTPDeviceMapService::RegisterMTPFileSystem,
           base::Unretained(MTPDeviceMapService::GetInstance()),
           info.location(), fsid));
 
   VolumeInfo volume_info;
   volume_info.type = VOLUME_TYPE_MTP;
   volume_info.mount_path = path;
@@ skipping 11 matching lines @@
     const storage_monitor::StorageInfo& info) {
   if (!storage_monitor::StorageInfo::IsMTPDevice(info.device_id()))
     return;
 
   for (std::map<std::string, VolumeInfo>::iterator it =
            mounted_volumes_.begin(); it != mounted_volumes_.end(); ++it) {
     if (it->second.source_path.value() == info.location()) {
       DoUnmountEvent(chromeos::MOUNT_ERROR_NONE, VolumeInfo(it->second));
 
       const std::string fsid = GetMountPointNameForMediaStorage(info);
-      fileapi::ExternalMountPoints::GetSystemInstance()->RevokeFileSystem(
-          fsid);
+      storage::ExternalMountPoints::GetSystemInstance()->RevokeFileSystem(fsid);
       content::BrowserThread::PostTask(
           content::BrowserThread::IO, FROM_HERE, base::Bind(
               &MTPDeviceMapService::RevokeMTPFileSystem,
               base::Unretained(MTPDeviceMapService::GetInstance()),
               fsid));
       return;
     }
   }
 }
 
@@ skipping 108 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