Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h" | 5 #include "chrome/browser/sync_file_system/drive_backend/sync_engine.h" |
| 6 | 6 |
| 7 #include "base/files/scoped_temp_dir.h" | 7 #include "base/files/scoped_temp_dir.h" |
| 8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "chrome/browser/drive/drive_uploader.h" | 10 #include "chrome/browser/drive/drive_uploader.h" |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 29 | 29 |
| 30 namespace { | 30 namespace { |
| 31 | 31 |
| 32 const char kAppID[] = "app_id"; | 32 const char kAppID[] = "app_id"; |
| 33 | 33 |
| 34 void EmptyTask(SyncStatusCode status, const SyncStatusCallback& callback) { | 34 void EmptyTask(SyncStatusCode status, const SyncStatusCallback& callback) { |
| 35 base::MessageLoop::current()->PostTask( | 35 base::MessageLoop::current()->PostTask( |
| 36 FROM_HERE, base::Bind(callback, status)); | 36 FROM_HERE, base::Bind(callback, status)); |
| 37 } | 37 } |
| 38 | 38 |
| 39 void SetStatusMap(RemoteFileSyncService::OriginStatusMap* status_map_out, | |
| 40 const RemoteFileSyncService::OriginStatusMap& status_map) { | |
| 41 *status_map_out = status_map; | |
| 42 } | |
| 43 | |
| 39 } // namespace | 44 } // namespace |
| 40 | 45 |
| 41 class MockSyncTask : public ExclusiveTask { | 46 class MockSyncTask : public ExclusiveTask { |
| 42 public: | 47 public: |
| 43 explicit MockSyncTask(bool used_network) { | 48 explicit MockSyncTask(bool used_network) { |
| 44 set_used_network(used_network); | 49 set_used_network(used_network); |
| 45 } | 50 } |
| 46 virtual ~MockSyncTask() {} | 51 virtual ~MockSyncTask() {} |
| 47 | 52 |
| 48 virtual void RunExclusive(const SyncStatusCallback& callback) OVERRIDE { | 53 virtual void RunExclusive(const SyncStatusCallback& callback) OVERRIDE { |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 239 | 244 |
| 240 ASSERT_FALSE(metadata_database->FindAppRootTracker("app_2", &tracker)); | 245 ASSERT_FALSE(metadata_database->FindAppRootTracker("app_2", &tracker)); |
| 241 } | 246 } |
| 242 | 247 |
| 243 TEST_F(SyncEngineTest, GetOriginStatusMap) { | 248 TEST_F(SyncEngineTest, GetOriginStatusMap) { |
| 244 FileTracker tracker; | 249 FileTracker tracker; |
| 245 SyncStatusCode sync_status = SYNC_STATUS_UNKNOWN; | 250 SyncStatusCode sync_status = SYNC_STATUS_UNKNOWN; |
| 246 GURL origin = extensions::Extension::GetBaseURLFromExtensionId(kAppID); | 251 GURL origin = extensions::Extension::GetBaseURLFromExtensionId(kAppID); |
| 247 | 252 |
| 248 sync_engine()->RegisterOrigin(GURL("chrome-extension://app_0"), | 253 sync_engine()->RegisterOrigin(GURL("chrome-extension://app_0"), |
| 249 CreateResultReceiver(&sync_status)); | 254 CreateResultReceiver(&sync_status)); |
| 250 base::RunLoop().RunUntilIdle(); | 255 base::RunLoop().RunUntilIdle(); |
| 251 EXPECT_EQ(SYNC_STATUS_OK, sync_status); | 256 EXPECT_EQ(SYNC_STATUS_OK, sync_status); |
| 252 | 257 |
| 253 sync_engine()->RegisterOrigin(GURL("chrome-extension://app_1"), | 258 sync_engine()->RegisterOrigin(GURL("chrome-extension://app_1"), |
| 254 CreateResultReceiver(&sync_status)); | 259 CreateResultReceiver(&sync_status)); |
| 255 base::RunLoop().RunUntilIdle(); | 260 base::RunLoop().RunUntilIdle(); |
| 256 EXPECT_EQ(SYNC_STATUS_OK, sync_status); | 261 EXPECT_EQ(SYNC_STATUS_OK, sync_status); |
| 257 | 262 |
| 258 RemoteFileSyncService::OriginStatusMap status_map; | 263 RemoteFileSyncService::OriginStatusMap status_map; |
| 259 sync_engine()->GetOriginStatusMap(&status_map); | 264 sync_engine()->GetOriginStatusMap(base::Bind(&SetStatusMap, &status_map)); |
|
tzik
2014/05/21 10:52:33
Does CreateResultReceiver work for this?
peria
2014/05/22 02:25:21
It doesn't work well.
No viable conversion is foun
| |
| 265 base::RunLoop().RunUntilIdle(); | |
| 260 ASSERT_EQ(2u, status_map.size()); | 266 ASSERT_EQ(2u, status_map.size()); |
| 261 EXPECT_EQ("Enabled", status_map[GURL("chrome-extension://app_0")]); | 267 EXPECT_EQ("Enabled", status_map[GURL("chrome-extension://app_0")]); |
| 262 EXPECT_EQ("Enabled", status_map[GURL("chrome-extension://app_1")]); | 268 EXPECT_EQ("Enabled", status_map[GURL("chrome-extension://app_1")]); |
| 263 | 269 |
| 264 sync_engine()->DisableOrigin(GURL("chrome-extension://app_1"), | 270 sync_engine()->DisableOrigin(GURL("chrome-extension://app_1"), |
| 265 CreateResultReceiver(&sync_status)); | 271 CreateResultReceiver(&sync_status)); |
| 266 base::RunLoop().RunUntilIdle(); | 272 base::RunLoop().RunUntilIdle(); |
| 267 EXPECT_EQ(SYNC_STATUS_OK, sync_status); | 273 EXPECT_EQ(SYNC_STATUS_OK, sync_status); |
| 268 | 274 |
| 269 sync_engine()->GetOriginStatusMap(&status_map); | 275 sync_engine()->GetOriginStatusMap(base::Bind(&SetStatusMap, &status_map)); |
| 276 base::RunLoop().RunUntilIdle(); | |
| 270 ASSERT_EQ(2u, status_map.size()); | 277 ASSERT_EQ(2u, status_map.size()); |
| 271 EXPECT_EQ("Enabled", status_map[GURL("chrome-extension://app_0")]); | 278 EXPECT_EQ("Enabled", status_map[GURL("chrome-extension://app_0")]); |
| 272 EXPECT_EQ("Disabled", status_map[GURL("chrome-extension://app_1")]); | 279 EXPECT_EQ("Disabled", status_map[GURL("chrome-extension://app_1")]); |
| 273 } | 280 } |
| 274 | 281 |
| 275 TEST_F(SyncEngineTest, UpdateServiceState) { | 282 TEST_F(SyncEngineTest, UpdateServiceState) { |
| 276 EXPECT_EQ(REMOTE_SERVICE_OK, sync_engine()->GetCurrentState()); | 283 EXPECT_EQ(REMOTE_SERVICE_OK, sync_engine()->GetCurrentState()); |
| 277 | 284 |
| 278 GetSyncEngineTaskManager()->ScheduleTask( | 285 GetSyncEngineTaskManager()->ScheduleTask( |
| 279 FROM_HERE, | 286 FROM_HERE, |
| (...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 372 base::Bind(&SyncEngineTest::CheckServiceState, | 379 base::Bind(&SyncEngineTest::CheckServiceState, |
| 373 AsWeakPtr(), | 380 AsWeakPtr(), |
| 374 SYNC_STATUS_OK, | 381 SYNC_STATUS_OK, |
| 375 REMOTE_SERVICE_OK)); | 382 REMOTE_SERVICE_OK)); |
| 376 | 383 |
| 377 base::RunLoop().RunUntilIdle(); | 384 base::RunLoop().RunUntilIdle(); |
| 378 } | 385 } |
| 379 | 386 |
| 380 } // namespace drive_backend | 387 } // namespace drive_backend |
| 381 } // namespace sync_file_system | 388 } // namespace sync_file_system |
| OLD | NEW |