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/login_utils.h" | 5 #include "chrome/browser/chromeos/login/login_utils.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 .WillRepeatedly(DoAll(SetArgPointee<1>(kMode), | 196 .WillRepeatedly(DoAll(SetArgPointee<1>(kMode), |
197 Return(true))); | 197 Return(true))); |
198 EXPECT_CALL(*cryptohome_, InstallAttributesGet(kAttrEnterpriseDeviceId, _)) | 198 EXPECT_CALL(*cryptohome_, InstallAttributesGet(kAttrEnterpriseDeviceId, _)) |
199 .WillRepeatedly(DoAll(SetArgPointee<1>(kDeviceId), | 199 .WillRepeatedly(DoAll(SetArgPointee<1>(kDeviceId), |
200 Return(true))); | 200 Return(true))); |
201 test_api->SetCryptohomeLibrary(cryptohome_, true); | 201 test_api->SetCryptohomeLibrary(cryptohome_, true); |
202 | 202 |
203 browser_process_->SetProfileManager( | 203 browser_process_->SetProfileManager( |
204 new ProfileManagerWithoutInit(scoped_temp_dir_.path())); | 204 new ProfileManagerWithoutInit(scoped_temp_dir_.path())); |
205 connector_ = browser_process_->browser_policy_connector(); | 205 connector_ = browser_process_->browser_policy_connector(); |
| 206 connector_->Init(); |
206 | 207 |
207 RunAllPending(); | 208 RunAllPending(); |
208 } | 209 } |
209 | 210 |
210 virtual void TearDown() OVERRIDE { | 211 virtual void TearDown() OVERRIDE { |
211 cryptohome::AsyncMethodCaller::Shutdown(); | 212 cryptohome::AsyncMethodCaller::Shutdown(); |
212 mock_async_method_caller_ = NULL; | 213 mock_async_method_caller_ = NULL; |
213 | 214 |
214 RunAllPending(); | 215 RunAllPending(); |
215 { | 216 { |
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
511 } | 512 } |
512 | 513 |
513 INSTANTIATE_TEST_CASE_P( | 514 INSTANTIATE_TEST_CASE_P( |
514 LoginUtilsBlockingLoginTestInstance, | 515 LoginUtilsBlockingLoginTestInstance, |
515 LoginUtilsBlockingLoginTest, | 516 LoginUtilsBlockingLoginTest, |
516 testing::Values(0, 1, 2, 3, 4, 5)); | 517 testing::Values(0, 1, 2, 3, 4, 5)); |
517 | 518 |
518 } // namespace | 519 } // namespace |
519 | 520 |
520 } | 521 } |
OLD | NEW |