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

Unified Diff: chrome/browser/chromeos/login/test/oobe_screen_waiter.cc

Issue 79113002: kiosk: Network connectivity test during launch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years 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/chromeos/login/test/oobe_screen_waiter.cc
diff --git a/chrome/browser/chromeos/login/test/oobe_screen_waiter.cc b/chrome/browser/chromeos/login/test/oobe_screen_waiter.cc
index 456bd4c8f4fffb806b220a4d86a13fb918966867..1e2b44b04ad71a6eaddf767e1b0e79f2d5c0f22b 100644
--- a/chrome/browser/chromeos/login/test/oobe_screen_waiter.cc
+++ b/chrome/browser/chromeos/login/test/oobe_screen_waiter.cc
@@ -22,16 +22,20 @@ OobeScreenWaiter::~OobeScreenWaiter() {
}
void OobeScreenWaiter::Wait() {
- if (GetOobeUI()->current_screen() == expected_screen_) {
+ WaitNoAssertCurrentScreen();
+
+ ASSERT_EQ(expected_screen_, GetOobeUI()->current_screen());
+}
+
+void OobeScreenWaiter::WaitNoAssertCurrentScreen() {
+ if (GetOobeUI()->current_screen() == expected_screen_)
return;
- }
waiting_for_screen_ = true;
GetOobeUI()->AddObserver(this);
runner_ = new content::MessageLoopRunner;
runner_->Run();
- ASSERT_EQ(expected_screen_, GetOobeUI()->current_screen());
ASSERT_FALSE(waiting_for_screen_);
}

Powered by Google App Engine
This is Rietveld 408576698