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

Side by Side 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 unified diff | Download patch
OLDNEW
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
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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
231 "}" 231 "}"
232 "SendReplyIfEnrollmentDone();", 232 "SendReplyIfEnrollmentDone();",
233 &done)); 233 &done));
234 234
235 // Reset the enrollment helper so there is no side effect with other tests. 235 // Reset the enrollment helper so there is no side effect with other tests.
236 static_cast<EnrollmentScreen*>(wizard_controller->current_screen()) 236 static_cast<EnrollmentScreen*>(wizard_controller->current_screen())
237 ->enrollment_helper_.reset(); 237 ->enrollment_helper_.reset();
238 } 238 }
239 239
240 } // namespace chromeos 240 } // namespace chromeos
OLDNEW
« 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