[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..302e4a7643bdf4e566179b33aed11ae7140c05ca 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
@@ -246,30 +246,32 @@ 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);
-  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")]);
+  scoped_ptr<RemoteFileSyncService::OriginStatusMap> status_map;
+  sync_engine()->GetOriginStatusMap(CreateResultReceiver(&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")]);
 
   sync_engine()->DisableOrigin(GURL("chrome-extension://app_1"),
                                CreateResultReceiver(&sync_status));
   base::RunLoop().RunUntilIdle();
   EXPECT_EQ(SYNC_STATUS_OK, sync_status);
 
-  sync_engine()->GetOriginStatusMap(&status_map);
-  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")]);
+  sync_engine()->GetOriginStatusMap(CreateResultReceiver(&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")]);
 }
 
 TEST_F(SyncEngineTest, UpdateServiceState) {