sync: Refactor StatusChangeChecker hierarchy

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

 // Copyright 2014 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 "chrome/browser/sync/test/integration/quiesce_status_change_checker.h"
 
 #include "base/format_macros.h"
 #include "base/scoped_observer.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
@@ skipping 127 matching lines @@
 bool ProgressMarkerWatcher::HasLatestProgressMarkers() {
   return probably_has_latest_progress_markers_;
 }
 
 bool ProgressMarkerWatcher::IsSyncDisabled() {
   return ::IsSyncDisabled(service_);
 }
 
 QuiesceStatusChangeChecker::QuiesceStatusChangeChecker(
     std::vector<ProfileSyncService*> services)
-  : services_(services), timed_out_(false) {
+  : services_(services) {
   DCHECK_LE(1U, services_.size());
   for (size_t i = 0; i < services_.size(); ++i) {
     observers_.push_back(new ProgressMarkerWatcher(services[i], this));
   }
 }
 
 QuiesceStatusChangeChecker::~QuiesceStatusChangeChecker() {}
 
-base::TimeDelta QuiesceStatusChangeChecker::GetTimeoutDuration() {
-  return base::TimeDelta::FromSeconds(45);
-}
-
 void QuiesceStatusChangeChecker::Wait() {
   DVLOG(1) << "Await: " << GetDebugMessage();
 
   if (IsExitConditionSatisfied()) {
     DVLOG(1) << "Await -> Exit before waiting: " << GetDebugMessage();
     return;
   }
 
-  base::OneShotTimer<QuiesceStatusChangeChecker> timer;
-  timer.Start(FROM_HERE,
-              GetTimeoutDuration(),
-              base::Bind(&QuiesceStatusChangeChecker::OnTimeout,
-                         base::Unretained(this)));
-
-  {
-    base::MessageLoop* loop = base::MessageLoop::current();
-    base::MessageLoop::ScopedNestableTaskAllower allow(loop);
-    loop->Run();
-  }
+  StartBlockingWait();
 }
 
 bool QuiesceStatusChangeChecker::IsExitConditionSatisfied() {
   // Check that all progress markers are up to date.
   for (ScopedVector<ProgressMarkerWatcher>::const_iterator it =
        observers_.begin(); it != observers_.end(); ++it) {
     if ((*it)->IsSyncDisabled()) {
       continue;  // Skip disabled services.
     }
 
@@ skipping 35 matching lines @@
   return true;
 }
 
 std::string QuiesceStatusChangeChecker::GetDebugMessage() const {
   return base::StringPrintf("Waiting for quiescence of %" PRIuS " clients",
                             services_.size());
 }
 
 void QuiesceStatusChangeChecker::OnServiceStateChanged(
     ProfileSyncService* service) {
-  if (IsExitConditionSatisfied()) {
-    DVLOG(1) << "Await -> Condition met: " << GetDebugMessage();
-    base::MessageLoop::current()->QuitWhenIdle();
-  }
+  CheckExitCondition();
 }
-
-void QuiesceStatusChangeChecker::OnTimeout() {
-  DVLOG(1) << "Await -> Timed out: " << GetDebugMessage();
-  timed_out_ = true;
-  base::MessageLoop::current()->QuitWhenIdle();
-}
-
-bool QuiesceStatusChangeChecker::TimedOut() const {
-  return timed_out_;
-}