[SyncFS] Make GetOriginStatusMap asynchronous

chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc

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 b40cad557e059c9ecac756e7f793eb1eaea45c79..4d8739f9543d62d1e9973a7f1c3e27464e88205a 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
@@ -36,6 +36,11 @@ void EmptyTask(SyncStatusCode status, const SyncStatusCallback& callback) {
       FROM_HERE, base::Bind(callback, status));
 }
 
+void SetStatusMap(RemoteFileSyncService::OriginStatusMap* status_map_out,
+                  const RemoteFileSyncService::OriginStatusMap& status_map) {
+  *status_map_out = status_map;
+}
+
 }  // namespace
 
 class MockSyncTask : public ExclusiveTask {
@@ -246,17 +251,18 @@ TEST_F(SyncEngineTest, GetOriginStatusMap) {
   GURL origin = extensions::Extension::GetBaseURLFromExtensionId(kAppID);
 
   sync_engine()->RegisterOrigin(GURL("chrome-extension://app_0"),
-                                     CreateResultReceiver(&sync_status));
+                                CreateResultReceiver(&sync_status));
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(SYNC_STATUS_OK, sync_status);
 
   sync_engine()->RegisterOrigin(GURL("chrome-extension://app_1"),
-                                     CreateResultReceiver(&sync_status));
+                                CreateResultReceiver(&sync_status));
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(SYNC_STATUS_OK, sync_status);
 
   RemoteFileSyncService::OriginStatusMap status_map;
-  sync_engine()->GetOriginStatusMap(&status_map);
+  sync_engine()->GetOriginStatusMap(base::Bind(&SetStatusMap, &status_map));
+  base::RunLoop().RunUntilIdle();
   ASSERT_EQ(2u, status_map.size());
   EXPECT_EQ("Enabled", status_map[GURL("chrome-extension://app_0")]);
   EXPECT_EQ("Enabled", status_map[GURL("chrome-extension://app_1")]);
@@ -266,7 +272,8 @@ TEST_F(SyncEngineTest, GetOriginStatusMap) {
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(SYNC_STATUS_OK, sync_status);
 
-  sync_engine()->GetOriginStatusMap(&status_map);
+  sync_engine()->GetOriginStatusMap(base::Bind(&SetStatusMap, &status_map));
+  base::RunLoop().RunUntilIdle();
   ASSERT_EQ(2u, status_map.size());
   EXPECT_EQ("Enabled", status_map[GURL("chrome-extension://app_0")]);
   EXPECT_EQ("Disabled", status_map[GURL("chrome-extension://app_1")]);