| Index: chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
|
| index 5c353a38ea368f8c0f88fb10436a5fc5593f3603..ca6d5a78fd580c2d2adc1b1d80bedfc34140b551 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
|
| @@ -136,11 +136,7 @@ class SyncEngineTest
|
| MockExtensionService* extension_service() { return extension_service_.get(); }
|
| SyncEngine* sync_engine() { return sync_engine_.get(); }
|
|
|
| - void UpdateRegisteredApps() {
|
| - sync_engine_->UpdateRegisteredAppsForTesting();
|
| - }
|
| -
|
| - SyncTaskManager* GetSyncEngineTaskManager() {
|
| + SyncTaskManager* GetSyncTaskManager() {
|
| return sync_engine_->sync_worker_->GetSyncTaskManager();
|
| }
|
|
|
| @@ -155,10 +151,6 @@ class SyncEngineTest
|
| return sync_engine_->sync_worker_->GetMetadataDatabase();
|
| }
|
|
|
| - void SetHasRefreshToken(bool has_refresh_token) {
|
| - sync_engine_->sync_worker_->has_refresh_token_ = has_refresh_token;
|
| - }
|
| -
|
| private:
|
| content::TestBrowserThreadBundle browser_threads_;
|
| base::ScopedTempDir profile_dir_;
|
| @@ -202,52 +194,6 @@ TEST_F(SyncEngineTest, EnableOrigin) {
|
| ASSERT_FALSE(metadata_database()->FindAppRootTracker(kAppID, &tracker));
|
| }
|
|
|
| -TEST_F(SyncEngineTest, UpdateRegisteredApps) {
|
| - SyncStatusCode sync_status = SYNC_STATUS_UNKNOWN;
|
| - for (int i = 0; i < 3; i++) {
|
| - scoped_refptr<const extensions::Extension> extension =
|
| - extensions::ExtensionBuilder()
|
| - .SetManifest(extensions::DictionaryBuilder()
|
| - .Set("name", "foo")
|
| - .Set("version", "1.0")
|
| - .Set("manifest_version", 2))
|
| - .SetID(base::StringPrintf("app_%d", i))
|
| - .Build();
|
| - extension_service()->AddExtension(extension.get());
|
| - GURL origin = extensions::Extension::GetBaseURLFromExtensionId(
|
| - extension->id());
|
| - sync_status = SYNC_STATUS_UNKNOWN;
|
| - sync_engine()->RegisterOrigin(origin, CreateResultReceiver(&sync_status));
|
| - base::RunLoop().RunUntilIdle();
|
| - EXPECT_EQ(SYNC_STATUS_OK, sync_status);
|
| - }
|
| -
|
| - FileTracker tracker;
|
| -
|
| - ASSERT_TRUE(metadata_database()->FindAppRootTracker("app_0", &tracker));
|
| - EXPECT_EQ(TRACKER_KIND_APP_ROOT, tracker.tracker_kind());
|
| -
|
| - ASSERT_TRUE(metadata_database()->FindAppRootTracker("app_1", &tracker));
|
| - EXPECT_EQ(TRACKER_KIND_APP_ROOT, tracker.tracker_kind());
|
| -
|
| - ASSERT_TRUE(metadata_database()->FindAppRootTracker("app_2", &tracker));
|
| - EXPECT_EQ(TRACKER_KIND_APP_ROOT, tracker.tracker_kind());
|
| -
|
| - extension_service()->DisableExtension("app_1");
|
| - extension_service()->UninstallExtension("app_2");
|
| - ASSERT_FALSE(extension_service()->GetInstalledExtension("app_2"));
|
| - UpdateRegisteredApps();
|
| - base::RunLoop().RunUntilIdle();
|
| -
|
| - ASSERT_TRUE(metadata_database()->FindAppRootTracker("app_0", &tracker));
|
| - EXPECT_EQ(TRACKER_KIND_APP_ROOT, tracker.tracker_kind());
|
| -
|
| - ASSERT_TRUE(metadata_database()->FindAppRootTracker("app_1", &tracker));
|
| - EXPECT_EQ(TRACKER_KIND_DISABLED_APP_ROOT, tracker.tracker_kind());
|
| -
|
| - ASSERT_FALSE(metadata_database()->FindAppRootTracker("app_2", &tracker));
|
| -}
|
| -
|
| TEST_F(SyncEngineTest, GetOriginStatusMap) {
|
| FileTracker tracker;
|
| SyncStatusCode sync_status = SYNC_STATUS_UNKNOWN;
|
| @@ -285,9 +231,10 @@ TEST_F(SyncEngineTest, GetOriginStatusMap) {
|
| TEST_F(SyncEngineTest, UpdateServiceState) {
|
| EXPECT_EQ(REMOTE_SERVICE_OK, sync_engine()->GetCurrentState());
|
|
|
| - SetHasRefreshToken(true);
|
| + // Assume an user is in login state.
|
| + sync_engine()->OnReadyToSendRequests();
|
|
|
| - GetSyncEngineTaskManager()->ScheduleTask(
|
| + GetSyncTaskManager()->ScheduleTask(
|
| FROM_HERE,
|
| base::Bind(&EmptyTask, SYNC_STATUS_AUTHENTICATION_FAILED),
|
| SyncTaskManager::PRIORITY_MED,
|
| @@ -296,7 +243,7 @@ TEST_F(SyncEngineTest, UpdateServiceState) {
|
| SYNC_STATUS_AUTHENTICATION_FAILED,
|
| REMOTE_SERVICE_AUTHENTICATION_REQUIRED));
|
|
|
| - GetSyncEngineTaskManager()->ScheduleTask(
|
| + GetSyncTaskManager()->ScheduleTask(
|
| FROM_HERE,
|
| base::Bind(&EmptyTask, SYNC_STATUS_ACCESS_FORBIDDEN),
|
| SyncTaskManager::PRIORITY_MED,
|
| @@ -305,7 +252,7 @@ TEST_F(SyncEngineTest, UpdateServiceState) {
|
| SYNC_STATUS_ACCESS_FORBIDDEN,
|
| REMOTE_SERVICE_AUTHENTICATION_REQUIRED));
|
|
|
| - GetSyncEngineTaskManager()->ScheduleTask(
|
| + GetSyncTaskManager()->ScheduleTask(
|
| FROM_HERE,
|
| base::Bind(&EmptyTask, SYNC_STATUS_SERVICE_TEMPORARILY_UNAVAILABLE),
|
| SyncTaskManager::PRIORITY_MED,
|
| @@ -314,7 +261,7 @@ TEST_F(SyncEngineTest, UpdateServiceState) {
|
| SYNC_STATUS_SERVICE_TEMPORARILY_UNAVAILABLE,
|
| REMOTE_SERVICE_TEMPORARY_UNAVAILABLE));
|
|
|
| - GetSyncEngineTaskManager()->ScheduleTask(
|
| + GetSyncTaskManager()->ScheduleTask(
|
| FROM_HERE,
|
| base::Bind(&EmptyTask, SYNC_STATUS_NETWORK_ERROR),
|
| SyncTaskManager::PRIORITY_MED,
|
| @@ -323,7 +270,7 @@ TEST_F(SyncEngineTest, UpdateServiceState) {
|
| SYNC_STATUS_NETWORK_ERROR,
|
| REMOTE_SERVICE_TEMPORARY_UNAVAILABLE));
|
|
|
| - GetSyncEngineTaskManager()->ScheduleTask(
|
| + GetSyncTaskManager()->ScheduleTask(
|
| FROM_HERE,
|
| base::Bind(&EmptyTask, SYNC_STATUS_ABORT),
|
| SyncTaskManager::PRIORITY_MED,
|
| @@ -332,7 +279,7 @@ TEST_F(SyncEngineTest, UpdateServiceState) {
|
| SYNC_STATUS_ABORT,
|
| REMOTE_SERVICE_TEMPORARY_UNAVAILABLE));
|
|
|
| - GetSyncEngineTaskManager()->ScheduleTask(
|
| + GetSyncTaskManager()->ScheduleTask(
|
| FROM_HERE,
|
| base::Bind(&EmptyTask, SYNC_STATUS_FAILED),
|
| SyncTaskManager::PRIORITY_MED,
|
| @@ -341,7 +288,7 @@ TEST_F(SyncEngineTest, UpdateServiceState) {
|
| SYNC_STATUS_FAILED,
|
| REMOTE_SERVICE_TEMPORARY_UNAVAILABLE));
|
|
|
| - GetSyncEngineTaskManager()->ScheduleTask(
|
| + GetSyncTaskManager()->ScheduleTask(
|
| FROM_HERE,
|
| base::Bind(&EmptyTask, SYNC_DATABASE_ERROR_CORRUPTION),
|
| SyncTaskManager::PRIORITY_MED,
|
| @@ -350,7 +297,7 @@ TEST_F(SyncEngineTest, UpdateServiceState) {
|
| SYNC_DATABASE_ERROR_CORRUPTION,
|
| REMOTE_SERVICE_DISABLED));
|
|
|
| - GetSyncEngineTaskManager()->ScheduleTask(
|
| + GetSyncTaskManager()->ScheduleTask(
|
| FROM_HERE,
|
| base::Bind(&EmptyTask, SYNC_DATABASE_ERROR_IO_ERROR),
|
| SyncTaskManager::PRIORITY_MED,
|
| @@ -359,7 +306,7 @@ TEST_F(SyncEngineTest, UpdateServiceState) {
|
| SYNC_DATABASE_ERROR_IO_ERROR,
|
| REMOTE_SERVICE_DISABLED));
|
|
|
| - GetSyncEngineTaskManager()->ScheduleTask(
|
| + GetSyncTaskManager()->ScheduleTask(
|
| FROM_HERE,
|
| base::Bind(&EmptyTask, SYNC_DATABASE_ERROR_FAILED),
|
| SyncTaskManager::PRIORITY_MED,
|
| @@ -368,7 +315,7 @@ TEST_F(SyncEngineTest, UpdateServiceState) {
|
| SYNC_DATABASE_ERROR_FAILED,
|
| REMOTE_SERVICE_DISABLED));
|
|
|
| - GetSyncEngineTaskManager()->ScheduleSyncTask(
|
| + GetSyncTaskManager()->ScheduleSyncTask(
|
| FROM_HERE,
|
| scoped_ptr<SyncTask>(new MockSyncTask(false)),
|
| SyncTaskManager::PRIORITY_MED,
|
| @@ -377,7 +324,7 @@ TEST_F(SyncEngineTest, UpdateServiceState) {
|
| SYNC_STATUS_OK,
|
| REMOTE_SERVICE_DISABLED));
|
|
|
| - GetSyncEngineTaskManager()->ScheduleSyncTask(
|
| + GetSyncTaskManager()->ScheduleSyncTask(
|
| FROM_HERE,
|
| scoped_ptr<SyncTask>(new MockSyncTask(true)),
|
| SyncTaskManager::PRIORITY_MED,
|
|
|