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

chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/sync_file_system/drive_backend/conflict_resolver.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
@@ skipping 21 matching lines @@
 #include "google_apis/drive/gdata_errorcode.h"
 #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"
 
 namespace sync_file_system {
 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));
 }
 
 }  // namespace
 
 class ConflictResolverTest : public testing::Test {
  public:
   typedef FakeRemoteChangeProcessor::URLToFileChangesMap URLToFileChangesMap;
 
@@ skipping 94 matching lines @@
   std::string CreateRemoteFile(const std::string& parent_folder_id,
                                const std::string& title,
                                const std::string& content) {
     std::string file_id;
     EXPECT_EQ(google_apis::HTTP_SUCCESS,
               fake_drive_helper_->AddFile(
                   parent_folder_id, title, content, &file_id));
     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));
   }
 
   google_apis::GDataErrorCode AddFileToFolder(
       const std::string& parent_folder_id,
       const std::string& file_id) {
     google_apis::GDataErrorCode error = google_apis::GDATA_OTHER_ERROR;
     context_->GetDriveService()->AddResourceToDirectory(
@@ skipping 13 matching lines @@
   SyncStatusCode RunRemoteToLocalSyncer() {
     SyncStatusCode status = SYNC_STATUS_UNKNOWN;
     scoped_ptr<RemoteToLocalSyncer> syncer(
         new RemoteToLocalSyncer(context_.get()));
     syncer->RunPreflight(SyncTaskToken::CreateForTesting(
         CreateResultReceiver(&status)));
     base::RunLoop().RunUntilIdle();
     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())
       CreateTemporaryFileInDir(database_dir_.path(), &local_path);
     scoped_ptr<LocalToRemoteSyncer> syncer(new LocalToRemoteSyncer(
         context_.get(),
         SyncFileMetadata(file_change.file_type(), 0, base::Time()),
         file_change, local_path, url));
     syncer->RunPreflight(SyncTaskToken::CreateForTesting(
         CreateResultReceiver(&status)));
@@ skipping 172 matching lines @@
 
 TEST_F(ConflictResolverTest, ResolveConflict_RemoteFolderOnLocalFile) {
   const GURL kOrigin("chrome-extension://example");
   const std::string sync_root = CreateSyncRoot();
   const std::string app_root = CreateRemoteFolder(sync_root, kOrigin.host());
   InitializeMetadataDatabase();
   RegisterApp(kOrigin.host(), app_root);
   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);
   RunLocalToRemoteSyncer(
       kURL,
       FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE, SYNC_FILE_TYPE_FILE));
 
   // Create a folder on remote and sync it.
   const std::string primary = CreateRemoteFolder(app_root, kTitle);
   EXPECT_EQ(SYNC_STATUS_OK, ListChanges());
@@ skipping 26 matching lines @@
 
 TEST_F(ConflictResolverTest, ResolveConflict_RemoteNestedFolderOnLocalFile) {
   const GURL kOrigin("chrome-extension://example");
   const std::string sync_root = CreateSyncRoot();
   const std::string app_root = CreateRemoteFolder(sync_root, kOrigin.host());
   InitializeMetadataDatabase();
   RegisterApp(kOrigin.host(), app_root);
   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);
   RunLocalToRemoteSyncer(
       kURL,
       FileChange(FileChange::FILE_CHANGE_ADD_OR_UPDATE, SYNC_FILE_TYPE_FILE));
 
   // Create a folder and subfolder in it on remote, and sync it.
   const std::string primary = CreateRemoteFolder(app_root, kTitle);
   CreateRemoteFolder(primary, "nested");
@@ skipping 77 matching lines @@
 
   EXPECT_EQ(4, CountParents(file));
 
   EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver());
 
   EXPECT_EQ(1, CountParents(file));
 }
 
 }  // namespace drive_backend
 }  // namespace sync_file_system