| 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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 46 public: | 46 public: |
| 47 MOCK_CONST_METHOD0(GetCurrentNetworkName, base::string16(void)); | 47 MOCK_CONST_METHOD0(GetCurrentNetworkName, base::string16(void)); |
| 48 MOCK_CONST_METHOD0(IsConnected, bool(void)); | 48 MOCK_CONST_METHOD0(IsConnected, bool(void)); |
| 49 MOCK_CONST_METHOD0(IsConnecting, bool(void)); | 49 MOCK_CONST_METHOD0(IsConnecting, bool(void)); |
| 50 }; | 50 }; |
| 51 | 51 |
| 52 } // namespace login | 52 } // namespace login |
| 53 | 53 |
| 54 class NetworkScreenTest : public WizardInProcessBrowserTest { | 54 class NetworkScreenTest : public WizardInProcessBrowserTest { |
| 55 public: | 55 public: |
| 56 NetworkScreenTest(): WizardInProcessBrowserTest("network"), | 56 NetworkScreenTest() |
| 57 fake_session_manager_client_(NULL) { | 57 : WizardInProcessBrowserTest(OobeScreen::SCREEN_OOBE_NETWORK), |
| 58 } | 58 fake_session_manager_client_(nullptr) {} |
| 59 | 59 |
| 60 protected: | 60 protected: |
| 61 void SetUpInProcessBrowserTestFixture() override { | 61 void SetUpInProcessBrowserTestFixture() override { |
| 62 WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture(); | 62 WizardInProcessBrowserTest::SetUpInProcessBrowserTestFixture(); |
| 63 | 63 |
| 64 fake_session_manager_client_ = new FakeSessionManagerClient; | 64 fake_session_manager_client_ = new FakeSessionManagerClient; |
| 65 DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( | 65 DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( |
| 66 std::unique_ptr<SessionManagerClient>(fake_session_manager_client_)); | 66 std::unique_ptr<SessionManagerClient>(fake_session_manager_client_)); |
| 67 } | 67 } |
| 68 | 68 |
| 69 void SetUpOnMainThread() override { | 69 void SetUpOnMainThread() override { |
| 70 WizardInProcessBrowserTest::SetUpOnMainThread(); | 70 WizardInProcessBrowserTest::SetUpOnMainThread(); |
| 71 mock_base_screen_delegate_.reset(new MockBaseScreenDelegate()); | 71 mock_base_screen_delegate_.reset(new MockBaseScreenDelegate()); |
| 72 ASSERT_TRUE(WizardController::default_controller() != NULL); | 72 ASSERT_TRUE(WizardController::default_controller() != nullptr); |
| 73 network_screen_ = | 73 network_screen_ = |
| 74 NetworkScreen::Get(WizardController::default_controller()); | 74 NetworkScreen::Get(WizardController::default_controller()); |
| 75 ASSERT_TRUE(network_screen_ != NULL); | 75 ASSERT_TRUE(network_screen_ != nullptr); |
| 76 ASSERT_EQ(WizardController::default_controller()->current_screen(), | 76 ASSERT_EQ(WizardController::default_controller()->current_screen(), |
| 77 network_screen_); | 77 network_screen_); |
| 78 network_screen_->base_screen_delegate_ = mock_base_screen_delegate_.get(); | 78 network_screen_->base_screen_delegate_ = mock_base_screen_delegate_.get(); |
| 79 ASSERT_TRUE(network_screen_->view_ != nullptr); | 79 ASSERT_TRUE(network_screen_->view_ != nullptr); |
| 80 | 80 |
| 81 mock_network_state_helper_ = new login::MockNetworkStateHelper; | 81 mock_network_state_helper_ = new login::MockNetworkStateHelper; |
| 82 SetDefaultNetworkStateHelperExpectations(); | 82 SetDefaultNetworkStateHelperExpectations(); |
| 83 network_screen_->SetNetworkStateHelperForTest(mock_network_state_helper_); | 83 network_screen_->SetNetworkStateHelperForTest(mock_network_state_helper_); |
| 84 } | 84 } |
| 85 | 85 |
| (...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 "}" | 225 "}" |
| 226 "SendReplyIfEnrollmentDone();", | 226 "SendReplyIfEnrollmentDone();", |
| 227 &done)); | 227 &done)); |
| 228 | 228 |
| 229 // Reset the enrollment helper so there is no side effect with other tests. | 229 // Reset the enrollment helper so there is no side effect with other tests. |
| 230 static_cast<EnrollmentScreen*>(wizard_controller->current_screen()) | 230 static_cast<EnrollmentScreen*>(wizard_controller->current_screen()) |
| 231 ->enrollment_helper_.reset(); | 231 ->enrollment_helper_.reset(); |
| 232 } | 232 } |
| 233 | 233 |
| 234 } // namespace chromeos | 234 } // namespace chromeos |
| OLD | NEW |