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

chrome/browser/media_galleries/imported_media_gallery_registry.cc

Index: chrome/browser/media_galleries/imported_media_gallery_registry.cc
diff --git a/chrome/browser/media_galleries/imported_media_gallery_registry.cc b/chrome/browser/media_galleries/imported_media_gallery_registry.cc
index 5acc6b25b5d9da867edaa8a4fa2d280ed1f6d4d5..16624c693f114c5e07ac6ba678297f7dccb98eb5 100644
--- a/chrome/browser/media_galleries/imported_media_gallery_registry.cc
+++ b/chrome/browser/media_galleries/imported_media_gallery_registry.cc
@@ -13,11 +13,11 @@
 #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 {
 
@@ -55,7 +55,9 @@ bool ImportedMediaGalleryRegistry::RegisterPicasaFilesystemOnUIThread(
   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;
@@ -90,7 +92,9 @@ bool ImportedMediaGalleryRegistry::RegisterITunesFilesystemOnUIThread(
   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;
@@ -127,7 +131,9 @@ bool ImportedMediaGalleryRegistry::RegisterIPhotoFilesystemOnUIThread(
   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;