sync: Refactor bookmarks integration tests

chrome/browser/sync/test/integration/status_change_checker.h

 // 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.
 
 #ifndef CHROME_BROWSER_SYNC_TEST_INTEGRATION_STATUS_CHANGE_CHECKER_H_
 #define CHROME_BROWSER_SYNC_TEST_INTEGRATION_STATUS_CHANGE_CHECKER_H_
 
 #include <string>
 
+#include "base/run_loop.h"
 #include "base/time/time.h"
 
 class ProfileSyncServiceHarness;
 
 // Interface for a helper class that can pump the message loop while waiting
 // for a certain state transition to take place.
 //
 // This is a template that should be filled in by child classes so they can
 // observe specific kinds of changes and await specific conditions.
 //
 // The instances of this class are intended to be single-use.  It doesn't make
 // sense to call StartBlockingWait() more than once.
 class StatusChangeChecker {
  public:
-  explicit StatusChangeChecker();
+  StatusChangeChecker();
 
   // Returns a string representing this current StatusChangeChecker, and
   // possibly some small part of its state.  For example: "AwaitPassphraseError"
   // or "AwaitMigrationDone(BOOKMARKS)".
   virtual std::string GetDebugMessage() const = 0;
 
   // Returns true if the blocking wait was exited because of a timeout.
   bool TimedOut() const;
 
   virtual bool IsExitConditionSatisfied() = 0;
@@ skipping 15 matching lines @@
   // Stop the nested running of the message loop started in StartBlockingWait().
   void StopWaiting();
 
   // Checks IsExitConditionSatisfied() and calls StopWaiting() if it returns
   // true.
   void CheckExitCondition();
 
   // Called when the blocking wait timeout is exceeded.
   void OnTimeout();
 
+  // True if the checker stopped waiting because of timeout.
   bool timed_out_;
+
+  // The RunLoop used for waiting.
+  base::RunLoop run_loop_;
 };
 
 #endif  // CHROME_BROWSER_SYNC_TEST_INTEGRATION_STATUS_CHANGE_CHECKER_H_