Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4585)

Unified Diff: chrome/browser/sync/test/integration/status_change_checker.cc

Issue 165393010: Draft: Moving code out of ProfileSyncServiceHarness (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/test/integration/status_change_checker.cc
diff --git a/chrome/browser/sync/test/integration/status_change_checker.cc b/chrome/browser/sync/test/integration/status_change_checker.cc
index 364b3eab9761cfe21271ebcd191be0bbdf2c99bd..20dd50fb7aae969a63018b046c95ea45e57dbdd4 100644
--- a/chrome/browser/sync/test/integration/status_change_checker.cc
+++ b/chrome/browser/sync/test/integration/status_change_checker.cc
@@ -4,9 +4,98 @@
#include "chrome/browser/sync/test/integration/status_change_checker.h"
-StatusChangeChecker::StatusChangeChecker(const std::string& source)
- : source_(source) {
+#include "base/message_loop/message_loop.h"
+#include "base/timer/timer.h"
+#include "chrome/browser/sync/profile_sync_service_observer.h"
+
+StatusChangeChecker::StatusChangeChecker() {}
+
+StatusChangeChecker::~StatusChangeChecker() {}
+
+void StatusChangeChecker::set_is_waiting(bool value) {
+ is_waiting_ = value;
+}
+
+bool StatusChangeChecker::IsWaiting() {
+ return is_waiting_;
+}
+
+void StatusChangeChecker::StopWaitingAndSucceed() {
+ base::MessageLoop::current()->QuitWhenIdle();
+}
+
+class StatusChangeCheckerRunner : public ProfileSyncServiceObserver {
+ public:
+ explicit StatusChangeCheckerRunner(StatusChangeChecker*);
+ virtual ~StatusChangeCheckerRunner() OVERRIDE;
+
+ void Run();
+
+ virtual void OnStateChanged() OVERRIDE;
+ void OnTimeout();
+
+ bool timed_out() const { return timed_out_; }
+
+ private:
+ StatusChangeChecker* status_change_checker_;
+ bool timed_out_;
+};
+
+StatusChangeCheckerRunner::StatusChangeCheckerRunner(
+ StatusChangeChecker* checker)
+ : status_change_checker_(checker), timed_out_(false) {
+ status_change_checker_->set_is_waiting(true);
}
-StatusChangeChecker::~StatusChangeChecker() {
+StatusChangeCheckerRunner::~StatusChangeCheckerRunner() {
+ status_change_checker_->set_is_waiting(false);
}
+
+void StatusChangeCheckerRunner::Run() {
+ status_change_checker_->InitObserver(this);
+
+ base::OneShotTimer<StatusChangeCheckerRunner> timer;
+ timer.Start(FROM_HERE,
+ status_change_checker_->GetTimeoutDuration(),
+ base::Bind(&StatusChangeCheckerRunner::OnTimeout,
+ base::Unretained(this)));
+
+ {
+ base::MessageLoop* loop = base::MessageLoop::current();
+ base::MessageLoop::ScopedNestableTaskAllower allow(loop);
+ loop->Run();
+ }
+
+ status_change_checker_->UninitObserver(this);
+}
+
+void StatusChangeCheckerRunner::OnStateChanged() {
+ if (status_change_checker_->IsExitConditionSatisfied())
+ base::MessageLoop::current()->QuitWhenIdle();
+}
+
+void StatusChangeCheckerRunner::OnTimeout() {
+ timed_out_ = true;
+ base::MessageLoop::current()->QuitWhenIdle();
+}
+
+bool StatusChangeChecker::Run(StatusChangeChecker* checker) {
+ // Leave early if we can.
+ // TODO: Support different kinds of early exit checks.
+ if (checker->IsExitConditionSatisfied()) {
+ return true;
+ }
+
+ // Otherwise start waiting.
+ StatusChangeCheckerRunner runner(checker);
+ runner.Run();
+
+ if (runner.timed_out()) {
+ LOG(ERROR) << checker->GetDebugMessage() << ": timed out.";
+ CHECK(false) << "Ending test because of a timeout.";
+ return false;
+ }
+
+ DVLOG(1) << checker->GetDebugMessage() << ": succeeded.";
+ return true;
+};
« no previous file with comments | « chrome/browser/sync/test/integration/status_change_checker.h ('k') | chrome/browser/sync/test/integration/sync_auth_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698