[SyncFS] Split SyncEngine and SyncEngineContext

chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc

Index: chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc b/chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc
index 1bde78ea6bab949ed043bc49a8530fa53aa3bfbd..c9d689924500ea6f0f899567eb11bb5fb4030245 100644
--- a/chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/list_changes_task_unittest.cc
@@ -32,8 +32,7 @@ const char kUnregisteredAppID[] = "app_id unregistered";
 
 }  // namespace
 
-class ListChangesTaskTest : public testing::Test,
-                            public SyncEngineContext {
+class ListChangesTaskTest : public testing::Test {
  public:
   ListChangesTaskTest() {}
   virtual ~ListChangesTaskTest() {}
@@ -42,49 +41,36 @@ class ListChangesTaskTest : public testing::Test,
     ASSERT_TRUE(database_dir_.CreateUniqueTempDir());
     in_memory_env_.reset(leveldb::NewMemEnv(leveldb::Env::Default()));
 
-    fake_drive_service_.reset(new drive::FakeDriveService);
-    ASSERT_TRUE(fake_drive_service_->LoadAccountMetadataForWapi(
+    scoped_ptr<drive::FakeDriveService> fake_drive_service;
+    fake_drive_service.reset(new drive::FakeDriveService);

[tzik, 2014/03/27 11:24:17]

ditto to conflict_resolver_unittest.cc.

[peria, 2014/03/28 03:20:23]

Done.

+    ASSERT_TRUE(fake_drive_service->LoadAccountMetadataForWapi(
         "sync_file_system/account_metadata.json"));
-    ASSERT_TRUE(fake_drive_service_->LoadResourceListForWapi(
+    ASSERT_TRUE(fake_drive_service->LoadResourceListForWapi(
         "gdata/empty_feed.json"));
 
-    drive_uploader_.reset(new drive::DriveUploader(
-        fake_drive_service_.get(), base::MessageLoopProxy::current()));
+    scoped_ptr<drive::DriveUploader> drive_uploader;
+    drive_uploader.reset(new drive::DriveUploader(
+        fake_drive_service.get(), base::MessageLoopProxy::current()));
 
     fake_drive_service_helper_.reset(new FakeDriveServiceHelper(
-        fake_drive_service_.get(), drive_uploader_.get(),
+        fake_drive_service.get(), drive_uploader.get(),
         kSyncRootFolderTitle));
 
+    context_.reset(new SyncEngineContext(
+        fake_drive_service.PassAs<drive::DriveServiceInterface>(),
+        drive_uploader.PassAs<drive::DriveUploaderInterface>(),
+        base::MessageLoopProxy::current()));
+
     SetUpRemoteFolders();
     InitializeMetadataDatabase();
     RegisterApp(kAppID);
   }
 
   virtual void TearDown() OVERRIDE {
-    metadata_database_.reset();
+    context_.reset();
     base::RunLoop().RunUntilIdle();
   }
 
-  virtual drive::DriveServiceInterface* GetDriveService() OVERRIDE {
-    return fake_drive_service_.get();
-  }
-
-  virtual drive::DriveUploader* GetDriveUploader() OVERRIDE {
-    return NULL;
-  }
-
-  virtual MetadataDatabase* GetMetadataDatabase() OVERRIDE {
-    return metadata_database_.get();
-  }
-
-  virtual RemoteChangeProcessor* GetRemoteChangeProcessor() OVERRIDE {
-    return NULL;
-  }
-
-  virtual base::SequencedTaskRunner* GetBlockingTaskRunner() OVERRIDE {
-    return base::MessageLoopProxy::current();
-  }
-
  protected:
   SyncStatusCode RunTask(SequentialSyncTask* sync_task) {
     SyncStatusCode status = SYNC_STATUS_UNKNOWN;
@@ -94,7 +80,7 @@ class ListChangesTaskTest : public testing::Test,
   }
 
   size_t CountDirtyTracker() {
-    return metadata_database_->CountDirtyTracker();
+    return context_->GetMetadataDatabase()->CountDirtyTracker();
   }
 
   FakeDriveServiceHelper* fake_drive_service_helper() {
@@ -137,7 +123,7 @@ class ListChangesTaskTest : public testing::Test,
   }
 
   std::string root_resource_id() {
-    return fake_drive_service_->GetRootResourceId();
+    return context_->GetDriveService()->GetRootResourceId();
   }
 
   std::string app_root_folder_id() {
@@ -148,6 +134,10 @@ class ListChangesTaskTest : public testing::Test,
     return unregistered_app_root_folder_id_;
   }
 
+  SyncEngineContext* GetSyncEngineContext() {
+    return context_.get();
+  }
+
  private:
   void SetUpRemoteFolders() {
     ASSERT_EQ(google_apis::HTTP_CREATED,
@@ -163,17 +153,17 @@ class ListChangesTaskTest : public testing::Test,
   }
 
   void InitializeMetadataDatabase() {
-    SyncEngineInitializer initializer(this,
+    SyncEngineInitializer initializer(context_.get(),
                                       base::MessageLoopProxy::current(),
-                                      fake_drive_service_.get(),
+                                      context_->GetDriveService(),
                                       database_dir_.path(),
                                       in_memory_env_.get());
     EXPECT_EQ(SYNC_STATUS_OK, RunTask(&initializer));
-    metadata_database_ = initializer.PassMetadataDatabase();
+    context_->SetMetadataDatabase(initializer.PassMetadataDatabase());
   }
 
   void RegisterApp(const std::string& app_id) {
-    RegisterAppTask register_app(this, app_id);
+    RegisterAppTask register_app(context_.get(), app_id);
     EXPECT_EQ(SYNC_STATUS_OK, RunTask(&register_app));
   }
 
@@ -186,19 +176,16 @@ class ListChangesTaskTest : public testing::Test,
   content::TestBrowserThreadBundle browser_threads_;
   base::ScopedTempDir database_dir_;
 
-  scoped_ptr<drive::FakeDriveService> fake_drive_service_;
-  scoped_ptr<drive::DriveUploader> drive_uploader_;
+  scoped_ptr<SyncEngineContext> context_;
   scoped_ptr<FakeDriveServiceHelper> fake_drive_service_helper_;
 
-  scoped_ptr<MetadataDatabase> metadata_database_;
-
   DISALLOW_COPY_AND_ASSIGN(ListChangesTaskTest);
 };
 
 TEST_F(ListChangesTaskTest, NoChange) {
   size_t num_dirty_trackers = CountDirtyTracker();
 
-  ListChangesTask list_changes(this);
+  ListChangesTask list_changes(GetSyncEngineContext());
   EXPECT_EQ(SYNC_STATUS_NO_CHANGE_TO_SYNC, RunTask(&list_changes));
 
   EXPECT_EQ(num_dirty_trackers, CountDirtyTracker());
@@ -210,7 +197,7 @@ TEST_F(ListChangesTaskTest, UnrelatedChange) {
   SetUpChangesInFolder(root_resource_id());
   SetUpChangesInFolder(unregistered_app_root_folder_id());
 
-  ListChangesTask list_changes(this);
+  ListChangesTask list_changes(GetSyncEngineContext());
   EXPECT_EQ(SYNC_STATUS_OK, RunTask(&list_changes));
 
   EXPECT_EQ(num_dirty_trackers, CountDirtyTracker());
@@ -221,7 +208,7 @@ TEST_F(ListChangesTaskTest, UnderTrackedFolder) {
 
   SetUpChangesInFolder(app_root_folder_id());
 
-  ListChangesTask list_changes(this);
+  ListChangesTask list_changes(GetSyncEngineContext());
   EXPECT_EQ(SYNC_STATUS_OK, RunTask(&list_changes));
 
   EXPECT_EQ(num_dirty_trackers + 4, CountDirtyTracker());