Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2259)

Unified Diff: chrome/browser/sync/test/integration/sync_auth_test.cc

Issue 148723002: [sync] Eliminate Await*SyncCompletion methods in integration tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address feedback Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/test/integration/sync_auth_test.cc
diff --git a/chrome/browser/sync/test/integration/sync_auth_test.cc b/chrome/browser/sync/test/integration/sync_auth_test.cc
index 83d1f91b739eb405ce381412531cfc6e1a2f5d44..b3c26ff6a95e41591050c4ee8b134f3d50846c03 100644
--- a/chrome/browser/sync/test/integration/sync_auth_test.cc
+++ b/chrome/browser/sync/test/integration/sync_auth_test.cc
@@ -56,7 +56,7 @@ class SyncAuthTest : public SyncTest {
std::wstring title = base::StringPrintf(L"Bookmark %d", bookmark_index);
GURL url = GURL(base::StringPrintf("http://www.foo%d.com", bookmark_index));
EXPECT_TRUE(AddURL(0, title, url) != NULL);
- return GetClient(0)->AwaitFullSyncCompletion();
+ return GetClient(0)->AwaitCommitActivityCompletion();
}
// Sets the authenticated state of the python sync server to |auth_state| and
@@ -260,7 +260,7 @@ IN_PROC_BROWSER_TEST_F(SyncAuthTest, TokenExpiry) {
net::URLRequestStatus::SUCCESS);
// Verify that the next sync cycle is successful, and uses the new auth token.
- ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion());
+ ASSERT_TRUE(GetClient(0)->AwaitCommitActivityCompletion());
std::string new_token = GetClient(0)->service()->GetAccessTokenForTest();
ASSERT_NE(old_token, new_token);
}

Powered by Google App Engine
This is Rietveld 408576698