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 "base/memory/scoped_ptr.h" | 5 #include "base/memory/scoped_ptr.h" |
6 #include "chrome/browser/chromeos/login/helper.h" | 6 #include "chrome/browser/chromeos/login/helper.h" |
7 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h" | 7 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h" |
8 #include "chrome/browser/chromeos/login/screens/network_screen.h" | 8 #include "chrome/browser/chromeos/login/screens/network_screen.h" |
9 #include "chrome/browser/chromeos/login/screens/wizard_screen.h" | 9 #include "chrome/browser/chromeos/login/screens/wizard_screen.h" |
10 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h" | 10 #include "chrome/browser/chromeos/login/test/wizard_in_process_browser_test.h" |
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 fake_session_manager_client_ = new FakeSessionManagerClient; | 56 fake_session_manager_client_ = new FakeSessionManagerClient; |
57 DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( | 57 DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( |
58 scoped_ptr<SessionManagerClient>(fake_session_manager_client_)); | 58 scoped_ptr<SessionManagerClient>(fake_session_manager_client_)); |
59 } | 59 } |
60 | 60 |
61 virtual void SetUpOnMainThread() OVERRIDE { | 61 virtual void SetUpOnMainThread() OVERRIDE { |
62 WizardInProcessBrowserTest::SetUpOnMainThread(); | 62 WizardInProcessBrowserTest::SetUpOnMainThread(); |
63 mock_screen_observer_.reset(new MockScreenObserver()); | 63 mock_screen_observer_.reset(new MockScreenObserver()); |
64 ASSERT_TRUE(WizardController::default_controller() != NULL); | 64 ASSERT_TRUE(WizardController::default_controller() != NULL); |
65 network_screen_ = | 65 network_screen_ = |
66 WizardController::default_controller()->GetNetworkScreen(); | 66 NetworkScreen::Get(WizardController::default_controller()); |
67 ASSERT_TRUE(network_screen_ != NULL); | 67 ASSERT_TRUE(network_screen_ != NULL); |
68 ASSERT_EQ(WizardController::default_controller()->current_screen(), | 68 ASSERT_EQ(WizardController::default_controller()->current_screen(), |
69 network_screen_); | 69 network_screen_); |
70 network_screen_->screen_observer_ = mock_screen_observer_.get(); | 70 network_screen_->screen_observer_ = mock_screen_observer_.get(); |
71 ASSERT_TRUE(network_screen_->actor() != NULL); | 71 ASSERT_TRUE(network_screen_->actor() != NULL); |
72 | 72 |
73 mock_network_state_helper_ = new login::MockNetworkStateHelper; | 73 mock_network_state_helper_ = new login::MockNetworkStateHelper; |
74 SetDefaultNetworkStateHelperExpectations(); | 74 SetDefaultNetworkStateHelperExpectations(); |
75 network_screen_->SetNetworkStateHelperForTest(mock_network_state_helper_); | 75 network_screen_->SetNetworkStateHelperForTest(mock_network_state_helper_); |
76 } | 76 } |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 // EXPECT_FALSE(actor_->IsConnecting()); | 142 // EXPECT_FALSE(actor_->IsConnecting()); |
143 network_screen_->OnConnectionTimeout(); | 143 network_screen_->OnConnectionTimeout(); |
144 | 144 |
145 // Close infobubble with error message - it makes the test stable. | 145 // Close infobubble with error message - it makes the test stable. |
146 // EXPECT_FALSE(actor_->IsContinueEnabled()); | 146 // EXPECT_FALSE(actor_->IsContinueEnabled()); |
147 // EXPECT_FALSE(actor_->IsConnecting()); | 147 // EXPECT_FALSE(actor_->IsConnecting()); |
148 // actor_->ClearErrors(); | 148 // actor_->ClearErrors(); |
149 } | 149 } |
150 | 150 |
151 } // namespace chromeos | 151 } // namespace chromeos |
OLD | NEW |