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

Side by Side Diff: chrome/browser/chromeos/login/login_utils_browsertest.cc

Issue 10693022: Add support for loading user cloud policy on desktop. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: removed redundant #ifdef OS_CHROMEOS guard Created 8 years, 4 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 | Annotate | Revision Log
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/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
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();
207 206
208 RunAllPending(); 207 RunAllPending();
209 } 208 }
210 209
211 virtual void TearDown() OVERRIDE { 210 virtual void TearDown() OVERRIDE {
212 cryptohome::AsyncMethodCaller::Shutdown(); 211 cryptohome::AsyncMethodCaller::Shutdown();
213 mock_async_method_caller_ = NULL; 212 mock_async_method_caller_ = NULL;
214 213
215 RunAllPending(); 214 RunAllPending();
216 { 215 {
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 } 511 }
513 512
514 INSTANTIATE_TEST_CASE_P( 513 INSTANTIATE_TEST_CASE_P(
515 LoginUtilsBlockingLoginTestInstance, 514 LoginUtilsBlockingLoginTestInstance,
516 LoginUtilsBlockingLoginTest, 515 LoginUtilsBlockingLoginTest,
517 testing::Values(0, 1, 2, 3, 4, 5)); 516 testing::Values(0, 1, 2, 3, 4, 5));
518 517
519 } // namespace 518 } // namespace
520 519
521 } 520 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698