Upstream version 7.36.149.0

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

diff --git a/src/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc b/src/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
index 3a0cbd7..b528b52 100644 (file)
--- a/src/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
+++ b/src/chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc
@@ -10,6 +10,7 @@
 #include "base/run_loop.h"
 #include "chrome/browser/drive/drive_uploader.h"
 #include "chrome/browser/drive/fake_drive_service.h"
+#include "chrome/browser/drive/test_util.h"
 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h"
 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.h"
 #include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"
@@ -62,30 +63,29 @@ class DriveBackendSyncTest : public testing::Test,
         &profile_, in_memory_env_.get());
     local_sync_service_->AddChangeObserver(this);
 
-    scoped_ptr<drive::FakeDriveService> drive_service(
-        new drive::FakeDriveService());
+    scoped_ptr<drive::FakeDriveService>
+        drive_service(new drive::FakeDriveService);
     drive_service->Initialize("test@example.com");
-    ASSERT_TRUE(drive_service->LoadAccountMetadataForWapi(
-        "sync_file_system/account_metadata.json"));
-    ASSERT_TRUE(drive_service->LoadResourceListForWapi(
-        "gdata/root_feed.json"));
+    ASSERT_TRUE(drive::test_util::SetUpTestEntries(drive_service.get()));
 
     scoped_ptr<drive::DriveUploaderInterface> uploader(
         new drive::DriveUploader(drive_service.get(),
                                  file_task_runner_.get()));
 
+    fake_drive_service_helper_.reset(new FakeDriveServiceHelper(
+        drive_service.get(), uploader.get(),
+        kSyncRootFolderTitle));
+
     remote_sync_service_.reset(new SyncEngine(
-        base_dir_.path(),
-        file_task_runner_.get(),
         drive_service.PassAs<drive::DriveServiceInterface>(),
         uploader.Pass(),
-        NULL, NULL, NULL, in_memory_env_.get()));
+        file_task_runner_.get(),
+        NULL, NULL, NULL));
     remote_sync_service_->AddServiceObserver(this);
-    remote_sync_service_->Initialize();
-
-    fake_drive_service_helper_.reset(new FakeDriveServiceHelper(
-        fake_drive_service(), drive_uploader(),
-        kSyncRootFolderTitle));
+    remote_sync_service_->Initialize(base_dir_.path(),
+                                     base::MessageLoopProxy::current(),
+                                     in_memory_env_.get());
+    remote_sync_service_->SetSyncEnabled(true);
 
     local_sync_service_->SetLocalChangeProcessor(remote_sync_service_.get());
     remote_sync_service_->SetRemoteChangeProcessor(local_sync_service_.get());
@@ -345,13 +345,11 @@ class DriveBackendSyncTest : public testing::Test,
                   folder_id, &remote_entries));
     std::map<std::string, const google_apis::ResourceEntry*>
         remote_entry_by_title;
-    for (ScopedVector<google_apis::ResourceEntry>::iterator itr =
-             remote_entries.begin();
-         itr != remote_entries.end();
-         ++itr) {
-      const google_apis::ResourceEntry& remote_entry = **itr;
-      EXPECT_FALSE(ContainsKey(remote_entry_by_title, remote_entry.title()));
-      remote_entry_by_title[remote_entry.title()] = *itr;
+    for (size_t i = 0; i < remote_entries.size(); ++i) {
+      google_apis::ResourceEntry* remote_entry = remote_entries[i];
+      EXPECT_FALSE(ContainsKey(remote_entry_by_title, remote_entry->title()))
+          << "title: " << remote_entry->title();
+      remote_entry_by_title[remote_entry->title()] = remote_entry;
     }
 
     fileapi::FileSystemURL url(CreateURL(app_id, path));
@@ -410,7 +408,7 @@ class DriveBackendSyncTest : public testing::Test,
 
     CannedSyncableFileSystem* file_system = file_systems_[app_id];
     std::stack<base::FilePath> folders;
-    folders.push(base::FilePath()); // root folder
+    folders.push(base::FilePath());  // root folder
 
     size_t result = 1;
     while (!folders.empty()) {
@@ -454,11 +452,11 @@ class DriveBackendSyncTest : public testing::Test,
   }
 
   size_t CountMetadata() {
-    return metadata_database()->file_by_id_.size();
+    return metadata_database()->CountFileMetadata();
   }
 
   size_t CountTracker() {
-    return metadata_database()->tracker_by_id_.size();
+    return metadata_database()->CountFileTracker();
   }
 
   drive::FakeDriveService* fake_drive_service() {
@@ -466,10 +464,6 @@ class DriveBackendSyncTest : public testing::Test,
         remote_sync_service_->GetDriveService());
   }
 
-  drive::DriveUploaderInterface* drive_uploader() {
-    return remote_sync_service_->GetDriveUploader();
-  }
-
   FakeDriveServiceHelper* fake_drive_service_helper() {
     return fake_drive_service_helper_.get();
   }