Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / sync_file_system / drive_backend / conflict_resolver_unittest.cc

diff --git a/src/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc b/src/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
index d0d4c0f..f23b9e9 100644 (file)
--- a/src/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
+++ b/src/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "base/callback.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/run_loop.h"
 #include "base/thread_task_runner_handle.h"
@@ -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));
 }
@@ -120,10 +119,8 @@ class ConflictResolverTest : public testing::Test {
 
   void RegisterApp(const std::string& app_id,
                    const std::string& app_root_folder_id) {
-    SyncStatusCode status = SYNC_STATUS_FAILED;
-    context_->GetMetadataDatabase()->RegisterApp(app_id, app_root_folder_id,
-                                                 CreateResultReceiver(&status));
-    base::RunLoop().RunUntilIdle();
+    SyncStatusCode status = context_->GetMetadataDatabase()->RegisterApp(
+        app_id, app_root_folder_id);
     EXPECT_EQ(SYNC_STATUS_OK, status);
   }
 
@@ -155,7 +152,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 +186,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())
@@ -219,7 +215,7 @@ class ConflictResolverTest : public testing::Test {
       status = RunRemoteToLocalSyncer();
     } while (status == SYNC_STATUS_OK ||
              status == SYNC_STATUS_RETRY ||
-             metadata_database->PromoteLowerPriorityTrackersToNormal());
+             metadata_database->PromoteDemotedTrackers());
     EXPECT_EQ(SYNC_STATUS_NO_CHANGE_TO_SYNC, status);
   }
 
@@ -384,7 +380,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 +427,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);