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

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

Issue 2566443005: cros: Replace WizardController string constants with OobeScreen values. (Closed)
Patch Set: Address comments Created 3 years, 11 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/network_screen_browsertest.cc
diff --git a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc
index dad70bcd8202ed93187059e62137110611ea03ae..2c7249e2ada56da2c310660fb5c738cf72849792 100644
--- a/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc
+++ b/chrome/browser/chromeos/login/screens/network_screen_browsertest.cc
@@ -53,9 +53,9 @@ class MockNetworkStateHelper : public NetworkStateHelper {
class NetworkScreenTest : public WizardInProcessBrowserTest {
public:
- NetworkScreenTest(): WizardInProcessBrowserTest("network"),
- fake_session_manager_client_(NULL) {
- }
+ NetworkScreenTest()
+ : WizardInProcessBrowserTest(OobeScreen::SCREEN_OOBE_NETWORK),
+ fake_session_manager_client_(nullptr) {}
protected:
void SetUpInProcessBrowserTestFixture() override {
@@ -69,10 +69,10 @@ class NetworkScreenTest : public WizardInProcessBrowserTest {
void SetUpOnMainThread() override {
WizardInProcessBrowserTest::SetUpOnMainThread();
mock_base_screen_delegate_.reset(new MockBaseScreenDelegate());
- ASSERT_TRUE(WizardController::default_controller() != NULL);
+ ASSERT_TRUE(WizardController::default_controller() != nullptr);
network_screen_ =
NetworkScreen::Get(WizardController::default_controller());
- ASSERT_TRUE(network_screen_ != NULL);
+ ASSERT_TRUE(network_screen_ != nullptr);
ASSERT_EQ(WizardController::default_controller()->current_screen(),
network_screen_);
network_screen_->base_screen_delegate_ = mock_base_screen_delegate_.get();
« no previous file with comments | « chrome/browser/chromeos/login/screens/network_screen.cc ('k') | chrome/browser/chromeos/login/screens/reset_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698