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

Unified Diff: chrome/browser/chromeos/login/screens/update_screen_browsertest.cc

Issue 2739073002: cros: Use ScreenManager as a component instead of deriving WizardController from it (Closed)
Patch Set: Address comment Created 3 years, 9 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/chromeos/login/screens/update_screen_browsertest.cc
diff --git a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
index 0eff665908a3f5cc6766aa245d88508896f46abe..84dbbc83db982a35338252f66dbbea3edfabe773 100644
--- a/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/screens/update_screen_browsertest.cc
@@ -83,9 +83,10 @@ class UpdateScreenTest : public WizardInProcessBrowserTest {
WizardInProcessBrowserTest::SetUpOnMainThread();
- ASSERT_TRUE(WizardController::default_controller() != NULL);
- update_screen_ = UpdateScreen::Get(WizardController::default_controller());
- ASSERT_TRUE(update_screen_ != NULL);
+ ASSERT_TRUE(WizardController::default_controller() != nullptr);
+ update_screen_ = UpdateScreen::Get(
+ WizardController::default_controller()->screen_manager());
+ ASSERT_TRUE(update_screen_ != nullptr);
ASSERT_EQ(WizardController::default_controller()->current_screen(),
update_screen_);
update_screen_->base_screen_delegate_ = mock_base_screen_delegate_.get();

Powered by Google App Engine
This is Rietveld 408576698