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 <vector> | 5 #include <vector> |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/callback.h" | 9 #include "base/callback.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
171 Return(reinterpret_cast<IBusInputContextClient*>(NULL))); | 171 Return(reinterpret_cast<IBusInputContextClient*>(NULL))); |
172 EXPECT_CALL(*mock_dbus_thread_manager->mock_shill_manager_client(), | 172 EXPECT_CALL(*mock_dbus_thread_manager->mock_shill_manager_client(), |
173 GetProperties(_)) | 173 GetProperties(_)) |
174 .Times(AnyNumber()); | 174 .Times(AnyNumber()); |
175 EXPECT_CALL(*mock_dbus_thread_manager->mock_shill_manager_client(), | 175 EXPECT_CALL(*mock_dbus_thread_manager->mock_shill_manager_client(), |
176 AddPropertyChangedObserver(_)) | 176 AddPropertyChangedObserver(_)) |
177 .Times(AnyNumber()); | 177 .Times(AnyNumber()); |
178 EXPECT_CALL(*mock_dbus_thread_manager->mock_shill_manager_client(), | 178 EXPECT_CALL(*mock_dbus_thread_manager->mock_shill_manager_client(), |
179 RemovePropertyChangedObserver(_)) | 179 RemovePropertyChangedObserver(_)) |
180 .Times(AnyNumber()); | 180 .Times(AnyNumber()); |
181 EXPECT_CALL(*mock_dbus_thread_manager->mock_update_engine_client(), | |
182 GetLastStatus()) | |
183 .Times(1) | |
184 .WillOnce(Return(MockUpdateEngineClient::Status())); | |
185 | 181 |
186 SetUpSessionManager(mock_dbus_thread_manager); | 182 SetUpSessionManager(mock_dbus_thread_manager); |
187 | 183 |
188 DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager); | 184 DBusThreadManager::InitializeForTesting(mock_dbus_thread_manager); |
189 CrosInProcessBrowserTest::SetUpInProcessBrowserTestFixture(); | 185 CrosInProcessBrowserTest::SetUpInProcessBrowserTestFixture(); |
190 cros_mock_->InitStatusAreaMocks(); | 186 cros_mock_->InitStatusAreaMocks(); |
191 cros_mock_->SetStatusAreaMocksExpectations(); | 187 cros_mock_->SetStatusAreaMocksExpectations(); |
192 | 188 |
193 mock_network_library_ = cros_mock_->mock_network_library(); | 189 mock_network_library_ = cros_mock_->mock_network_library(); |
194 EXPECT_CALL(*mock_network_library_, AddUserActionObserver(_)) | 190 EXPECT_CALL(*mock_network_library_, AddUserActionObserver(_)) |
(...skipping 618 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
813 | 809 |
814 // Wait for login tasks to complete. | 810 // Wait for login tasks to complete. |
815 content::RunAllPendingInMessageLoop(); | 811 content::RunAllPendingInMessageLoop(); |
816 | 812 |
817 // Timer should still be stopped after login completes. | 813 // Timer should still be stopped after login completes. |
818 ASSERT_TRUE(auto_login_timer()); | 814 ASSERT_TRUE(auto_login_timer()); |
819 EXPECT_FALSE(auto_login_timer()->IsRunning()); | 815 EXPECT_FALSE(auto_login_timer()->IsRunning()); |
820 } | 816 } |
821 | 817 |
822 } // namespace chromeos | 818 } // namespace chromeos |
OLD | NEW |