[sync] Eliminate Await*SyncCompletion methods in integration tests

chrome/browser/sync/test/integration/sync_auth_test.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/strings/stringprintf.h"
 #include "base/threading/platform_thread.h"
 #include "base/time/time.h"
 #include "chrome/browser/signin/profile_oauth2_token_service.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
@@ skipping 38 matching lines @@
   SyncAuthTest() : SyncTest(SINGLE_CLIENT) {}
   virtual ~SyncAuthTest() {}
 
   // Helper function that adds a bookmark with index |bookmark_index| and waits
   // for sync to complete. The return value indicates whether the sync cycle
   // completed successfully (true) or encountered an auth error (false).
   bool AddBookmarkAndWaitForSync(int bookmark_index) {
     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
   // sets the canned response that will be returned to the OAuth2TokenService
   // when it tries to fetch an access token.
   void SetAuthStateAndTokenResponse(PythonServerAuthState auth_state,
                                     const std::string& response_data,
                                     net::HttpStatusCode response_code,
                                     net::URLRequestStatus::Status status) {
     TriggerAuthState(auth_state);
@@ skipping 183 matching lines @@
   ASSERT_TRUE(
       GetClient(0)->service()->IsRetryingAccessTokenFetchForTest());
 
   // Trigger an auth success state and set up a new valid OAuth2 token.
   SetAuthStateAndTokenResponse(AUTHENTICATED_TRUE,
                                kValidOAuth2Token,
                                net::HTTP_OK,
                                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);
 }