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

chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

Index: chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
index d0d4c0f9c94981d1c3c01ed201d8f00fdeb85f60..4ff5ad9fedecc635c30db50d8eac1a9a4ae1ac68 100644
--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
@@ -39,8 +39,7 @@ namespace drive_backend {
 
 namespace {
 
-fileapi::FileSystemURL URL(const GURL& origin,
-                           const std::string& path) {
+storage::FileSystemURL URL(const GURL& origin, const std::string& path) {
   return CreateSyncableFileSystemURL(
       origin, base::FilePath::FromUTF8Unsafe(path));
 }
@@ -155,7 +154,7 @@ class ConflictResolverTest : public testing::Test {
     return file_id;
   }
 
-  void CreateLocalFile(const fileapi::FileSystemURL& url) {
+  void CreateLocalFile(const storage::FileSystemURL& url) {
     remote_change_processor_->UpdateLocalFileMetadata(
         url, FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE,
                         SYNC_FILE_TYPE_FILE));
@@ -189,9 +188,8 @@ class ConflictResolverTest : public testing::Test {
     return status;
   }
 
-  SyncStatusCode RunLocalToRemoteSyncer(
-      const fileapi::FileSystemURL& url,
-      const FileChange& file_change) {
+  SyncStatusCode RunLocalToRemoteSyncer(const storage::FileSystemURL& url,
+                                        const FileChange& file_change) {
     SyncStatusCode status = SYNC_STATUS_UNKNOWN;
     base::FilePath local_path = base::FilePath(FILE_PATH_LITERAL("dummy"));
     if (file_change.IsAddOrUpdate())
@@ -384,7 +382,7 @@ TEST_F(ConflictResolverTest, ResolveConflict_RemoteFolderOnLocalFile) {
   RunRemoteToLocalSyncerUntilIdle();
 
   const std::string kTitle = "foo";
-  fileapi::FileSystemURL kURL = URL(kOrigin, kTitle);
+  storage::FileSystemURL kURL = URL(kOrigin, kTitle);
 
   // Create a file on local and sync it.
   CreateLocalFile(kURL);
@@ -431,7 +429,7 @@ TEST_F(ConflictResolverTest, ResolveConflict_RemoteNestedFolderOnLocalFile) {
   RunRemoteToLocalSyncerUntilIdle();
 
   const std::string kTitle = "foo";
-  fileapi::FileSystemURL kURL = URL(kOrigin, kTitle);
+  storage::FileSystemURL kURL = URL(kOrigin, kTitle);
 
   // Create a file on local and sync it.
   CreateLocalFile(kURL);