sync: Improve StatusChangeChecker debug strings

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

 // Copyright (c) 2012 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/prefs/pref_member.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
 #include "chrome/browser/sync/test/integration/passwords_helper.h"
 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"
@@ skipping 14 matching lines @@
   virtual ~SyncErrorTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SyncErrorTest);
 };
 
 // Helper class that waits until the sync engine has hit an actionable error.
 class ActionableErrorChecker : public StatusChangeChecker {
  public:
   explicit ActionableErrorChecker(ProfileSyncService* service)
-      : StatusChangeChecker("ActionableErrorChecker"),
-        service_(service) {}
+      : service_(service) {}
 
   virtual ~ActionableErrorChecker() {}
 
   // Checks if an actionable error has been hit. Called repeatedly each time PSS
   // notifies observers of a state change.
   virtual bool IsExitConditionSatisfied() OVERRIDE {
     DCHECK(service_);
     ProfileSyncService::Status status;
     service_->QueryDetailedSyncStatus(&status);
     return (status.sync_protocol_error.action != syncer::UNKNOWN_ACTION &&
             service_->HasUnrecoverableError());
   }
 
+  virtual std::string GetDebugMessage() const OVERRIDE {
+    return "ActionableErrorChecker";

[tim (not reviewing), 2014/02/18 19:25:44]

uber nit - might be nice to try to stick to a simple pattern so we can look at
log spew and immediately know which part is complaining e.g 

"StatusChangeChecker: Waiting for auth error."
"StatusChangeChecker: Waiting for actionable error."
"StatusChangeChecker:  <exponential backoff blah blah...>

(I think "waiting for auth error" is pretty generic / could come from anywhere,
for example.)

+  }
+
  private:
   // The PSS instance that will eventually hit an actionable error.
   ProfileSyncService* service_;
 
   DISALLOW_COPY_AND_ASSIGN(ActionableErrorChecker);
 };
 
 IN_PROC_BROWSER_TEST_F(SyncErrorTest, BirthdayErrorTest) {
   ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
 
@@ skipping 22 matching lines @@
   protocol_error.error_description = "Not My Fault";
   protocol_error.url = "www.google.com";
   TriggerSyncError(protocol_error, SyncTest::ERROR_FREQUENCY_ALWAYS);
 
   // Now make one more change so we will do another sync.
   const BookmarkNode* node2 = AddFolder(0, 0, L"title2");
   SetTitle(0, node2, L"new_title2");
 
   // Wait until an actionable error is encountered.
   ActionableErrorChecker actionable_error_checker(GetClient(0)->service());
-  ASSERT_TRUE(GetClient(0)->AwaitStatusChange(&actionable_error_checker,
-                                              "Awaiting actionable error"));
+  ASSERT_TRUE(GetClient(0)->AwaitStatusChange(&actionable_error_checker));
 
   ProfileSyncService::Status status = GetClient(0)->GetStatus();
   ASSERT_EQ(status.sync_protocol_error.error_type, protocol_error.error_type);
   ASSERT_EQ(status.sync_protocol_error.action, protocol_error.action);
   ASSERT_EQ(status.sync_protocol_error.url, protocol_error.url);
   ASSERT_EQ(status.sync_protocol_error.error_description,
       protocol_error.error_description);
 }
 
 IN_PROC_BROWSER_TEST_F(SyncErrorTest, ErrorWhileSettingUp) {
@@ skipping 65 matching lines @@
   synced_datatypes = GetClient(0)->service()->GetPreferredDataTypes();
   ASSERT_FALSE(synced_datatypes.Has(syncer::TYPED_URLS));
 
   const BookmarkNode* node1 = AddFolder(0, 0, L"title1");
   SetTitle(0, node1, L"new_title1");
   ASSERT_TRUE(GetClient(0)->AwaitCommitActivityCompletion());
   // TODO(lipalani)" Verify initial sync ended for typed url is false.
 }
 
 }  // namespace