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

chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_sync_unittest.cc

Index: chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_sync_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_sync_unittest.cc b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_sync_unittest.cc
index f174717eb86d063cead02308b6cd0cf3acb28b50..ba604bcd44bd9dd1701db1177c3d493ae6f60930 100644
--- a/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_sync_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend_v1/drive_file_sync_service_sync_unittest.cc
@@ -34,7 +34,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h"
 #include "third_party/leveldatabase/src/include/leveldb/env.h"
-#include "webkit/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_context.h"
 
 #define FPL(path) FILE_PATH_LITERAL(path)
 
@@ -164,7 +164,7 @@ class DriveFileSyncServiceSyncTest : public testing::Test {
   void AddOrUpdateLocalFile(const GURL& origin,
                             const base::FilePath& path,
                             const std::string& content) {
-    fileapi::FileSystemURL url(CreateSyncableFileSystemURL(origin, path));
+    storage::FileSystemURL url(CreateSyncableFileSystemURL(origin, path));
     ASSERT_TRUE(ContainsKey(file_systems_, origin));
     EXPECT_EQ(base::File::FILE_OK, file_systems_[origin]->CreateFile(url));
     int64 bytes_written = file_systems_[origin]->WriteString(url, content);
@@ -193,7 +193,7 @@ class DriveFileSyncServiceSyncTest : public testing::Test {
 
   SyncStatusCode ProcessLocalChange() {
     SyncStatusCode status = SYNC_STATUS_UNKNOWN;
-    fileapi::FileSystemURL url;
+    storage::FileSystemURL url;
     local_sync_service_->ProcessLocalChange(
         CreateResultReceiver(&status, &url));
     FlushMessageLoop();
@@ -202,7 +202,7 @@ class DriveFileSyncServiceSyncTest : public testing::Test {
 
   SyncStatusCode ProcessRemoteChange() {
     SyncStatusCode status = SYNC_STATUS_UNKNOWN;
-    fileapi::FileSystemURL url;
+    storage::FileSystemURL url;
     remote_sync_service_->ProcessRemoteChange(
         CreateResultReceiver(&status, &url));
     FlushMessageLoop();
@@ -313,7 +313,7 @@ class DriveFileSyncServiceSyncTest : public testing::Test {
       remote_entry_by_title[remote_entry.title()] = *itr;
     }
 
-    fileapi::FileSystemURL url(CreateSyncableFileSystemURL(origin, path));
+    storage::FileSystemURL url(CreateSyncableFileSystemURL(origin, path));
     CannedSyncableFileSystem::FileEntryList local_entries;
     EXPECT_EQ(base::File::FILE_OK,
               file_system->ReadDirectory(url, &local_entries));
@@ -321,8 +321,8 @@ class DriveFileSyncServiceSyncTest : public testing::Test {
              local_entries.begin();
          itr != local_entries.end();
          ++itr) {
-      const fileapi::DirectoryEntry& local_entry = *itr;
-      fileapi::FileSystemURL entry_url(
+      const storage::DirectoryEntry& local_entry = *itr;
+      storage::FileSystemURL entry_url(
           CreateSyncableFileSystemURL(origin, path.Append(local_entry.name)));
       std::string title = DriveFileSyncService::PathToTitle(entry_url.path());
       ASSERT_TRUE(ContainsKey(remote_entry_by_title, title));
@@ -348,7 +348,7 @@ class DriveFileSyncServiceSyncTest : public testing::Test {
                                 const base::FilePath& path,
                                 const std::string& file_id,
                                 CannedSyncableFileSystem* file_system) {
-    fileapi::FileSystemURL url(CreateSyncableFileSystemURL(origin, path));
+    storage::FileSystemURL url(CreateSyncableFileSystemURL(origin, path));
     std::string file_content;
     EXPECT_EQ(google_apis::HTTP_SUCCESS,
               fake_drive_helper_->ReadFile(file_id, &file_content));