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

chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store_unittest.cc

Index: chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store_unittest.cc b/chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store_unittest.cc
index 16ec7974b3be11d9e116cb3dd97bdd5531639d90..f16817bef5af81636f31c0f171557e37b58950a9 100644
--- a/chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend_v1/drive_metadata_store_unittest.cc
@@ -25,7 +25,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/leveldatabase/src/include/leveldb/db.h"
 #include "third_party/leveldatabase/src/include/leveldb/write_batch.h"
-#include "webkit/browser/fileapi/isolated_context.h"
+#include "storage/browser/fileapi/isolated_context.h"
 
 #define FPL FILE_PATH_LITERAL
 
@@ -40,7 +40,7 @@ const char kOrigin[] = "chrome-extension://example";
 typedef DriveMetadataStore::ResourceIdByOrigin ResourceIdByOrigin;
 typedef DriveMetadataStore::OriginByResourceId OriginByResourceId;
 
-fileapi::FileSystemURL URL(const base::FilePath& path) {
+storage::FileSystemURL URL(const base::FilePath& path) {
   return CreateSyncableFileSystemURL(GURL(kOrigin), path);
 }
 
@@ -161,7 +161,7 @@ class DriveMetadataStoreTest : public testing::Test {
     return status;
   }
 
-  SyncStatusCode UpdateEntry(const fileapi::FileSystemURL& url,
+  SyncStatusCode UpdateEntry(const storage::FileSystemURL& url,
                              const DriveMetadata& metadata) {
     SyncStatusCode status = SYNC_STATUS_UNKNOWN;
     drive_metadata_store_->UpdateEntry(
@@ -172,7 +172,7 @@ class DriveMetadataStoreTest : public testing::Test {
     return status;
   }
 
-  SyncStatusCode DeleteEntry(const fileapi::FileSystemURL& url) {
+  SyncStatusCode DeleteEntry(const storage::FileSystemURL& url) {
     SyncStatusCode status = SYNC_STATUS_UNKNOWN;
     drive_metadata_store_->DeleteEntry(
         url,
@@ -301,7 +301,7 @@ class DriveMetadataStoreTest : public testing::Test {
 void DriveMetadataStoreTest::ReadWrite_Body() {
   InitializeDatabase();
 
-  const fileapi::FileSystemURL url = URL(base::FilePath());
+  const storage::FileSystemURL url = URL(base::FilePath());
   DriveMetadata metadata;
   EXPECT_EQ(SYNC_DATABASE_ERROR_NOT_FOUND,
             metadata_store()->ReadEntry(url, &metadata));
@@ -335,7 +335,7 @@ void DriveMetadataStoreTest::ReadWrite_Body() {
 void DriveMetadataStoreTest::GetConflictURLs_Body() {
   InitializeDatabase();
 
-  fileapi::FileSystemURLSet urls;
+  storage::FileSystemURLSet urls;
   EXPECT_EQ(SYNC_STATUS_OK, metadata_store()->GetConflictURLs(&urls));
   EXPECT_EQ(0U, urls.size());
 
@@ -587,10 +587,10 @@ void DriveMetadataStoreTest::GetFileMetadataMap_Body() {
   const base::FilePath folder_path = base::FilePath(FPL("folder_0"));
 
   const GURL origin = GURL("chrome-extension://app_a");
-  const fileapi::FileSystemURL url_0 = CreateSyncableFileSystemURL(
-      origin, file_path);
-  const fileapi::FileSystemURL url_1 = CreateSyncableFileSystemURL(
-      origin, folder_path);
+  const storage::FileSystemURL url_0 =
+      CreateSyncableFileSystemURL(origin, file_path);
+  const storage::FileSystemURL url_1 =
+      CreateSyncableFileSystemURL(origin, folder_path);
 
   // Insert DrivaMetadata objects.
   EXPECT_EQ(SYNC_STATUS_OK, UpdateEntry(