sync: Refactor StatusChangeChecker hierarchy

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

Index: chrome/browser/sync/test/integration/multi_client_status_change_checker.cc
diff --git a/chrome/browser/sync/test/integration/multi_client_status_change_checker.cc b/chrome/browser/sync/test/integration/multi_client_status_change_checker.cc
index df18a182c1a873834d2acc11b73ec91f575995bc..9821967924fa4a20cb1af91873fbda7c9e5daa02 100644
--- a/chrome/browser/sync/test/integration/multi_client_status_change_checker.cc
+++ b/chrome/browser/sync/test/integration/multi_client_status_change_checker.cc
@@ -10,19 +10,10 @@
 
 MultiClientStatusChangeChecker::MultiClientStatusChangeChecker(
     std::vector<ProfileSyncService*> services)
-  : services_(services), timed_out_(false) {}
+  : services_(services) {}
 
 MultiClientStatusChangeChecker::~MultiClientStatusChangeChecker() {}
 
-base::TimeDelta MultiClientStatusChangeChecker::GetTimeoutDuration() {
-  return base::TimeDelta::FromSeconds(45);
-}
-void MultiClientStatusChangeChecker::OnTimeout() {
-  DVLOG(1) << "Await -> Timed out: " << GetDebugMessage();
-  timed_out_ = true;
-  base::MessageLoop::current()->QuitWhenIdle();
-}
-
 void MultiClientStatusChangeChecker::Wait() {
   DVLOG(1) << "Await: " << GetDebugMessage();
 
@@ -37,27 +28,9 @@ void MultiClientStatusChangeChecker::Wait() {
     obs.Add(*it);
   }
 
-  base::OneShotTimer<MultiClientStatusChangeChecker> timer;
-  timer.Start(FROM_HERE,
-              GetTimeoutDuration(),
-              base::Bind(&MultiClientStatusChangeChecker::OnTimeout,
-                         base::Unretained(this)));
-
-  {
-    base::MessageLoop* loop = base::MessageLoop::current();
-    base::MessageLoop::ScopedNestableTaskAllower allow(loop);
-    loop->Run();
-  }
+  StartBlockingWait();
 }
 
 void MultiClientStatusChangeChecker::OnStateChanged() {
-  DVLOG(1) << "Await -> Checking Condition: " << GetDebugMessage();
-  if (IsExitConditionSatisfied()) {
-    DVLOG(1) << "Await -> Condition met: " << GetDebugMessage();
-    base::MessageLoop::current()->QuitWhenIdle();
-  }
-}
-
-bool MultiClientStatusChangeChecker::TimedOut() {
-  return timed_out_;
+  CheckExitCondition();
 }