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

chrome/browser/media_galleries/imported_media_gallery_registry.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/media_galleries/imported_media_gallery_registry.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "chrome/browser/media_galleries/fileapi/iphoto_data_provider.h"
 #include "chrome/browser/media_galleries/fileapi/itunes_data_provider.h"
 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
 #include "chrome/browser/media_galleries/fileapi/picasa_data_provider.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/browser_thread.h"
-#include "webkit/browser/fileapi/external_mount_points.h"
-#include "webkit/common/fileapi/file_system_mount_option.h"
+#include "storage/browser/fileapi/external_mount_points.h"
+#include "storage/common/fileapi/file_system_mount_option.h"
 
 using base::Bind;
-using fileapi::ExternalMountPoints;
+using storage::ExternalMountPoints;
 
 namespace {
 
 static base::LazyInstance<ImportedMediaGalleryRegistry>::Leaky
 g_imported_media_gallery_registry = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 // static
 ImportedMediaGalleryRegistry* ImportedMediaGalleryRegistry::GetInstance() {
@@ skipping 17 matching lines @@
   DCHECK(!fs_name.empty());
   DCHECK(!database_path.empty());
 
   bool result = false;
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
   base::FilePath root = ImportedRoot();
   if (root.empty())
     return false;
   result = ExternalMountPoints::GetSystemInstance()->RegisterFileSystem(
-      fs_name, fileapi::kFileSystemTypePicasa, fileapi::FileSystemMountOption(),
+      fs_name,
+      storage::kFileSystemTypePicasa,
+      storage::FileSystemMountOption(),
       root.AppendASCII("picasa"));
   if (!result)
     return result;
 
   picasa_fs_names_.insert(fs_name);
 
   if (picasa_fs_names_.size() == 1) {
     MediaFileSystemBackend::MediaTaskRunner()->PostTask(
         FROM_HERE,
         Bind(&ImportedMediaGalleryRegistry::RegisterPicasaFileSystem,
@@ skipping 14 matching lines @@
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(!library_xml_path.empty());
 
   bool result = false;
 
 #if defined(OS_WIN) || defined(OS_MACOSX)
   base::FilePath root = ImportedRoot();
   if (root.empty())
     return false;
   result = ExternalMountPoints::GetSystemInstance()->RegisterFileSystem(
-      fs_name, fileapi::kFileSystemTypeItunes, fileapi::FileSystemMountOption(),
+      fs_name,
+      storage::kFileSystemTypeItunes,
+      storage::FileSystemMountOption(),
       root.AppendASCII("itunes"));
   if (!result)
     return result;
 
   itunes_fs_names_.insert(fs_name);
 
   if (itunes_fs_names_.size() == 1) {
     MediaFileSystemBackend::MediaTaskRunner()->PostTask(
         FROM_HERE,
         Bind(&ImportedMediaGalleryRegistry::RegisterITunesFileSystem,
@@ skipping 16 matching lines @@
 
   bool result = false;
 
   // TODO(gbillock): Investigate how to refactor this to reduce duplicated
   // code.
 #if defined(OS_MACOSX)
   base::FilePath root = ImportedRoot();
   if (root.empty())
     return false;
   result = ExternalMountPoints::GetSystemInstance()->RegisterFileSystem(
-      fs_name, fileapi::kFileSystemTypeIphoto, fileapi::FileSystemMountOption(),
+      fs_name,
+      storage::kFileSystemTypeIphoto,
+      storage::FileSystemMountOption(),
       root.AppendASCII("iphoto"));
   if (!result)
     return result;
 
   iphoto_fs_names_.insert(fs_name);
 
   if (iphoto_fs_names_.size() == 1) {
     MediaFileSystemBackend::MediaTaskRunner()->PostTask(
         FROM_HERE,
         Bind(&ImportedMediaGalleryRegistry::RegisterIPhotoFileSystem,
@@ skipping 132 matching lines @@
   DCHECK(!iphoto_data_provider_);
   iphoto_data_provider_.reset(new iphoto::IPhotoDataProvider(xml_library_path));
 }
 
 void ImportedMediaGalleryRegistry::RevokeIPhotoFileSystem() {
   DCHECK(MediaFileSystemBackend::CurrentlyOnMediaTaskRunnerThread());
   DCHECK(iphoto_data_provider_);
   iphoto_data_provider_.reset();
 }
 #endif  // defined(OS_MACOSX)