| Index: chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
|
| diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
|
| index 04837190850cfd4e857d975011fa4eb2b025510a..f23b9e997dd7bfdcfdb174f5c8e5e1faf9c72e48 100644
|
| --- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
|
| +++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc
|
| @@ -119,10 +119,8 @@ class ConflictResolverTest : public testing::Test {
|
|
|
| void RegisterApp(const std::string& app_id,
|
| const std::string& app_root_folder_id) {
|
| - SyncStatusCode status = SYNC_STATUS_FAILED;
|
| - context_->GetMetadataDatabase()->RegisterApp(app_id, app_root_folder_id,
|
| - CreateResultReceiver(&status));
|
| - base::RunLoop().RunUntilIdle();
|
| + SyncStatusCode status = context_->GetMetadataDatabase()->RegisterApp(
|
| + app_id, app_root_folder_id);
|
| EXPECT_EQ(SYNC_STATUS_OK, status);
|
| }
|
|
|
|
|