Draft: Moving code out of ProfileSyncServiceHarness

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"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
-#include "chrome/browser/sync/test/integration/status_change_checker.h"
+#include "chrome/browser/sync/test/integration/single_client_status_change_checker.h"
 #include "chrome/browser/sync/test/integration/sync_test.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/url_request_status.h"
 
 using bookmarks_helper::AddURL;
 
 const char kShortLivedOAuth2Token[] =
     "{"
     "  \"refresh_token\": \"short_lived_refresh_token\","
@@ skipping 14 matching lines @@
                                         "}";
 
 const char kInvalidClientOAuth2Token[] = "{"
                                          "  \"error\": \"invalid_client\""
                                          "}";
 
 const char kEmptyOAuth2Token[] = "";
 
 const char kMalformedOAuth2Token[] = "{ \"foo\": ";
 
-class TestForAuthError : public StatusChangeChecker {
+class TestForAuthError : public SingleClientStatusChangeChecker {
  public:
   explicit TestForAuthError(ProfileSyncService* service);
   virtual ~TestForAuthError();
   virtual bool IsExitConditionSatisfied() OVERRIDE;
-
- private:
-  ProfileSyncService* service_;
+  virtual std::string GetDebugMessage() const OVERRIDE;
 };
 
 TestForAuthError::TestForAuthError(ProfileSyncService* service)
-  : StatusChangeChecker("Testing for auth error"), service_(service) {}
+  : SingleClientStatusChangeChecker(service) {}
 
 TestForAuthError::~TestForAuthError() {}
 
 bool TestForAuthError::IsExitConditionSatisfied() {
-  return !service_->HasUnsyncedItems() ||
-      (service_->GetSyncTokenStatus().last_get_token_error.state() !=
+  return !service()->HasUnsyncedItems() ||
+      (service()->GetSyncTokenStatus().last_get_token_error.state() !=
        GoogleServiceAuthError::NONE);
 }
 
+std::string TestForAuthError::GetDebugMessage() const {
+  return "Waiting for auth error";
+}
+
 class SyncAuthTest : public SyncTest {
  public:
   SyncAuthTest() : SyncTest(SINGLE_CLIENT), bookmark_index_(0) {}
   virtual ~SyncAuthTest() {}
 
   // Helper function that adds a bookmark and waits for either an auth error, or
   // for the bookmark to be committed.  Returns true if it detects an auth
   // error, false if the bookmark is committed successfully.
   bool AttemptToTriggerAuthError() {
     int bookmark_index = GetNextBookmarkIndex();
     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);
 
     // Run until the bookmark is committed or an auth error is encountered.
     TestForAuthError checker_(GetClient(0)->service());
-    GetClient(0)->AwaitStatusChange(&checker_, "Attempt to trigger auth error");
+    GetClient(0)->AwaitStatusChange(&checker_);
 
     GoogleServiceAuthError oauth_error =
         GetClient(0)->service()->GetSyncTokenStatus().last_get_token_error;
 
     return oauth_error.state() != GoogleServiceAuthError::NONE;
   }
 
   // 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.
@@ skipping 198 matching lines @@
   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)->AwaitCommitActivityCompletion());
   std::string new_token = GetClient(0)->service()->GetAccessTokenForTest();
   ASSERT_NE(old_token, new_token);
 }