OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/login/screens/network_screen.h" | 5 #include "chrome/browser/chromeos/login/screens/network_screen.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 | 64 |
65 fake_session_manager_client_ = new FakeSessionManagerClient; | 65 fake_session_manager_client_ = new FakeSessionManagerClient; |
66 DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( | 66 DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( |
67 std::unique_ptr<SessionManagerClient>(fake_session_manager_client_)); | 67 std::unique_ptr<SessionManagerClient>(fake_session_manager_client_)); |
68 } | 68 } |
69 | 69 |
70 void SetUpOnMainThread() override { | 70 void SetUpOnMainThread() override { |
71 WizardInProcessBrowserTest::SetUpOnMainThread(); | 71 WizardInProcessBrowserTest::SetUpOnMainThread(); |
72 mock_base_screen_delegate_.reset(new MockBaseScreenDelegate()); | 72 mock_base_screen_delegate_.reset(new MockBaseScreenDelegate()); |
73 ASSERT_TRUE(WizardController::default_controller() != nullptr); | 73 ASSERT_TRUE(WizardController::default_controller() != nullptr); |
74 network_screen_ = | 74 network_screen_ = NetworkScreen::Get( |
75 NetworkScreen::Get(WizardController::default_controller()); | 75 WizardController::default_controller()->screen_manager()); |
76 ASSERT_TRUE(network_screen_ != nullptr); | 76 ASSERT_TRUE(network_screen_ != nullptr); |
77 ASSERT_EQ(WizardController::default_controller()->current_screen(), | 77 ASSERT_EQ(WizardController::default_controller()->current_screen(), |
78 network_screen_); | 78 network_screen_); |
79 network_screen_->base_screen_delegate_ = mock_base_screen_delegate_.get(); | 79 network_screen_->base_screen_delegate_ = mock_base_screen_delegate_.get(); |
80 ASSERT_TRUE(network_screen_->view_ != nullptr); | 80 ASSERT_TRUE(network_screen_->view_ != nullptr); |
81 | 81 |
82 mock_network_state_helper_ = new login::MockNetworkStateHelper; | 82 mock_network_state_helper_ = new login::MockNetworkStateHelper; |
83 SetDefaultNetworkStateHelperExpectations(); | 83 SetDefaultNetworkStateHelperExpectations(); |
84 network_screen_->SetNetworkStateHelperForTest(mock_network_state_helper_); | 84 network_screen_->SetNetworkStateHelperForTest(mock_network_state_helper_); |
85 } | 85 } |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
271 // Wait for the enrollment screen. | 271 // Wait for the enrollment screen. |
272 OobeScreenWaiter(OobeScreen::SCREEN_OOBE_ENROLLMENT) | 272 OobeScreenWaiter(OobeScreen::SCREEN_OOBE_ENROLLMENT) |
273 .WaitNoAssertCurrentScreen(); | 273 .WaitNoAssertCurrentScreen(); |
274 | 274 |
275 // Reset the enrollment helper so there is no side effect with other tests. | 275 // Reset the enrollment helper so there is no side effect with other tests. |
276 static_cast<EnrollmentScreen*>(wizard_controller->current_screen()) | 276 static_cast<EnrollmentScreen*>(wizard_controller->current_screen()) |
277 ->enrollment_helper_.reset(); | 277 ->enrollment_helper_.reset(); |
278 } | 278 } |
279 | 279 |
280 } // namespace chromeos | 280 } // namespace chromeos |
OLD | NEW |