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 <string> | 5 #include <string> |
6 | 6 |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
9 #include "base/string16.h" | 9 #include "base/string16.h" |
10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
142 DBusThreadManager::Shutdown(); | 142 DBusThreadManager::Shutdown(); |
143 } | 143 } |
144 | 144 |
145 void EmulateContinueButtonExit(NetworkScreen* network_screen) { | 145 void EmulateContinueButtonExit(NetworkScreen* network_screen) { |
146 EXPECT_CALL(*mock_screen_observer_, | 146 EXPECT_CALL(*mock_screen_observer_, |
147 OnExit(ScreenObserver::NETWORK_CONNECTED)) | 147 OnExit(ScreenObserver::NETWORK_CONNECTED)) |
148 .Times(1); | 148 .Times(1); |
149 EXPECT_CALL(*mock_network_library_, Connected()) | 149 EXPECT_CALL(*mock_network_library_, Connected()) |
150 .WillOnce(Return(true)); | 150 .WillOnce(Return(true)); |
151 network_screen->OnContinuePressed(); | 151 network_screen->OnContinuePressed(); |
152 ui_test_utils::RunAllPendingInMessageLoop(); | 152 content::RunAllPendingInMessageLoop(); |
153 } | 153 } |
154 | 154 |
155 scoped_ptr<MockScreenObserver> mock_screen_observer_; | 155 scoped_ptr<MockScreenObserver> mock_screen_observer_; |
156 MockNetworkLibrary* mock_network_library_; | 156 MockNetworkLibrary* mock_network_library_; |
157 scoped_ptr<NetworkDevice> cellular_; | 157 scoped_ptr<NetworkDevice> cellular_; |
158 NetworkScreen* network_screen_; | 158 NetworkScreen* network_screen_; |
159 | 159 |
160 private: | 160 private: |
161 DISALLOW_COPY_AND_ASSIGN(NetworkScreenTest); | 161 DISALLOW_COPY_AND_ASSIGN(NetworkScreenTest); |
162 }; | 162 }; |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
286 // EXPECT_FALSE(actor_->IsConnecting()); | 286 // EXPECT_FALSE(actor_->IsConnecting()); |
287 network_screen_->OnConnectionTimeout(); | 287 network_screen_->OnConnectionTimeout(); |
288 | 288 |
289 // Close infobubble with error message - it makes the test stable. | 289 // Close infobubble with error message - it makes the test stable. |
290 // EXPECT_FALSE(actor_->IsContinueEnabled()); | 290 // EXPECT_FALSE(actor_->IsContinueEnabled()); |
291 // EXPECT_FALSE(actor_->IsConnecting()); | 291 // EXPECT_FALSE(actor_->IsConnecting()); |
292 // actor_->ClearErrors(); | 292 // actor_->ClearErrors(); |
293 } | 293 } |
294 | 294 |
295 } // namespace chromeos | 295 } // namespace chromeos |
OLD | NEW |