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

chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc

Index: chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
index d04e358740c043d0eb9e8b4c598f01f7378e006d..b23af01fd3f6bd0bb59608e45716be193294bdb9 100644
--- a/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
@@ -34,14 +34,14 @@
 #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(a) FILE_PATH_LITERAL(a)
 
 namespace sync_file_system {
 namespace drive_backend {
 
-typedef fileapi::FileSystemOperation::FileEntryList FileEntryList;
+typedef storage::FileSystemOperation::FileEntryList FileEntryList;
 
 namespace {
 
@@ -55,9 +55,9 @@ void SetValueAndCallClosure(const base::Closure& closure,
 
 void SetSyncStatusAndUrl(const base::Closure& closure,
                          SyncStatusCode* status_out,
-                         fileapi::FileSystemURL* url_out,
+                         storage::FileSystemURL* url_out,
                          SyncStatusCode status,
-                         const fileapi::FileSystemURL& url) {
+                         const storage::FileSystemURL& url) {
   *status_out = status;
   *url_out = url;
   closure.Run();
@@ -165,12 +165,12 @@ class DriveBackendSyncTest : public testing::Test,
   }
 
  protected:
-  fileapi::FileSystemURL CreateURL(const std::string& app_id,
+  storage::FileSystemURL CreateURL(const std::string& app_id,
                                    const base::FilePath::StringType& path) {
     return CreateURL(app_id, base::FilePath(path));
   }
 
-  fileapi::FileSystemURL CreateURL(const std::string& app_id,
+  storage::FileSystemURL CreateURL(const std::string& app_id,
                                    const base::FilePath& path) {
     GURL origin = extensions::Extension::GetBaseURLFromExtensionId(app_id);
     return CreateSyncableFileSystemURL(origin, path);
@@ -273,7 +273,7 @@ class DriveBackendSyncTest : public testing::Test,
   void AddOrUpdateLocalFile(const std::string& app_id,
                             const base::FilePath::StringType& path,
                             const std::string& content) {
-    fileapi::FileSystemURL url(CreateURL(app_id, path));
+    storage::FileSystemURL url(CreateURL(app_id, path));
     ASSERT_TRUE(ContainsKey(file_systems_, app_id));
     EXPECT_EQ(base::File::FILE_OK, file_systems_[app_id]->CreateFile(url));
     int64 bytes_written = file_systems_[app_id]->WriteString(url, content);
@@ -303,7 +303,7 @@ class DriveBackendSyncTest : public testing::Test,
 
   SyncStatusCode ProcessLocalChange() {
     SyncStatusCode status = SYNC_STATUS_UNKNOWN;
-    fileapi::FileSystemURL url;
+    storage::FileSystemURL url;
     base::RunLoop run_loop;
     local_sync_service_->ProcessLocalChange(base::Bind(
         &SetSyncStatusAndUrl, run_loop.QuitClosure(), &status, &url));
@@ -313,7 +313,7 @@ class DriveBackendSyncTest : public testing::Test,
 
   SyncStatusCode ProcessRemoteChange() {
     SyncStatusCode status = SYNC_STATUS_UNKNOWN;
-    fileapi::FileSystemURL url;
+    storage::FileSystemURL url;
     base::RunLoop run_loop;
     remote_sync_service_->ProcessRemoteChange(base::Bind(
         &SetSyncStatusAndUrl, run_loop.QuitClosure(), &status, &url));
@@ -462,18 +462,18 @@ class DriveBackendSyncTest : public testing::Test,
       remote_entry_by_title[remote_entry->title()] = remote_entry;
     }
 
-    fileapi::FileSystemURL url(CreateURL(app_id, path));
+    storage::FileSystemURL url(CreateURL(app_id, path));
     FileEntryList local_entries;
     EXPECT_EQ(base::File::FILE_OK,
               file_system->ReadDirectory(url, &local_entries));
     for (FileEntryList::iterator itr = 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(
           CreateURL(app_id, path.Append(local_entry.name)));
       std::string title =
-          fileapi::VirtualPath::BaseName(entry_url.path()).AsUTF8Unsafe();
+          storage::VirtualPath::BaseName(entry_url.path()).AsUTF8Unsafe();
       SCOPED_TRACE(testing::Message() << "Verifying entry: " << title);
 
       ASSERT_TRUE(ContainsKey(remote_entry_by_title, title));
@@ -500,7 +500,7 @@ class DriveBackendSyncTest : public testing::Test,
                                 const base::FilePath& path,
                                 const std::string& file_id,
                                 CannedSyncableFileSystem* file_system) {
-    fileapi::FileSystemURL url(CreateURL(app_id, path));
+    storage::FileSystemURL url(CreateURL(app_id, path));
     std::string file_content;
     EXPECT_EQ(google_apis::HTTP_SUCCESS,
               fake_drive_service_helper_->ReadFile(file_id, &file_content));
@@ -522,7 +522,7 @@ class DriveBackendSyncTest : public testing::Test,
 
     size_t result = 1;
     while (!folders.empty()) {
-      fileapi::FileSystemURL url(CreateURL(app_id, folders.top()));
+      storage::FileSystemURL url(CreateURL(app_id, folders.top()));
       folders.pop();
 
       FileEntryList entries;