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

chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util_unittest.cc

Index: chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util_unittest.cc b/chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util_unittest.cc
index db62e1ba4620145849b575f72e1b6036af0f1369..8e0a122dca7c6df9e4ca20da6d5bcc2125e5324f 100644
--- a/chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/metadata_db_migration_util_unittest.cc
@@ -13,8 +13,8 @@
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 #include "third_party/leveldatabase/src/include/leveldb/write_batch.h"
 #include "url/gurl.h"
-#include "webkit/browser/fileapi/external_mount_points.h"
-#include "webkit/common/fileapi/file_system_util.h"
+#include "storage/browser/fileapi/external_mount_points.h"
+#include "storage/common/fileapi/file_system_util.h"
 
 #define FPL FILE_PATH_LITERAL
 
@@ -29,19 +29,22 @@ bool CreateV0SerializedSyncableFileSystemURL(
     const GURL& origin,
     const base::FilePath& path,
     std::string* serialized_url) {
-  fileapi::ExternalMountPoints::GetSystemInstance()->RegisterFileSystem(
-      kV0ServiceName, fileapi::kFileSystemTypeSyncable,
-      fileapi::FileSystemMountOption(), base::FilePath());
-  fileapi::FileSystemURL url =
-      fileapi::ExternalMountPoints::GetSystemInstance()->
-          CreateExternalFileSystemURL(origin, kV0ServiceName, path);
-  fileapi::ExternalMountPoints::GetSystemInstance()->RevokeFileSystem(
+  storage::ExternalMountPoints::GetSystemInstance()->RegisterFileSystem(
+      kV0ServiceName,
+      storage::kFileSystemTypeSyncable,
+      storage::FileSystemMountOption(),
+      base::FilePath());
+  storage::FileSystemURL url =
+      storage::ExternalMountPoints::GetSystemInstance()
+          ->CreateExternalFileSystemURL(origin, kV0ServiceName, path);
+  storage::ExternalMountPoints::GetSystemInstance()->RevokeFileSystem(
       kV0ServiceName);
 
   if (!url.is_valid())
     return false;
-  *serialized_url = fileapi::GetExternalFileSystemRootURIString(
-        origin, kV0ServiceName) + url.path().AsUTF8Unsafe();
+  *serialized_url =
+      storage::GetExternalFileSystemRootURIString(origin, kV0ServiceName) +
+      url.path().AsUTF8Unsafe();
   return true;
 }
 
@@ -130,7 +133,7 @@ TEST(DriveMetadataDBMigrationUtilTest, MigrationFromV0) {
   options.create_if_missing = true;
   options.max_open_files = 0;  // Use minimum.
   leveldb::DB* db_ptr = NULL;
-  std::string db_dir = fileapi::FilePathToString(
+  std::string db_dir = storage::FilePathToString(
       base_dir.path().Append(DriveMetadataStore::kDatabaseName));
   leveldb::Status status = leveldb::DB::Open(options, db_dir, &db_ptr);
 
@@ -239,7 +242,7 @@ TEST(DriveMetadataDBMigrationUtilTest, MigrationFromV1) {
   leveldb::Options options;
   options.create_if_missing = true;
   leveldb::DB* db_ptr = NULL;
-  std::string db_dir = fileapi::FilePathToString(
+  std::string db_dir = storage::FilePathToString(
       base_dir.path().Append(DriveMetadataStore::kDatabaseName));
   leveldb::Status status = leveldb::DB::Open(options, db_dir, &db_ptr);
 
@@ -252,7 +255,7 @@ TEST(DriveMetadataDBMigrationUtilTest, MigrationFromV1) {
   batch.Put(kChangeStampKey, "1");
   batch.Put(kSyncRootDirectoryKey, kSyncRootResourceId);
 
-  fileapi::FileSystemURL url = CreateSyncableFileSystemURL(kOrigin1, kFile);
+  storage::FileSystemURL url = CreateSyncableFileSystemURL(kOrigin1, kFile);
 
   // Setup drive metadata.
   DriveMetadata drive_metadata;
@@ -356,7 +359,7 @@ TEST(DriveMetadataDBMigrationUtilTest, RollbackFromV4ToV3) {
 
     leveldb::Options options;
     options.create_if_missing = true;
-    std::string db_dir = fileapi::FilePathToString(
+    std::string db_dir = storage::FilePathToString(
         base_dir.path().Append(DriveMetadataStore::kDatabaseName));
     leveldb::Status status = leveldb::DB::Open(options, db_dir, &db_ptr);
     ASSERT_TRUE(status.ok());