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

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

Issue 9286003: Remove AsyncSetOwnerUser() from cryptohome library (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Ready to go. Created 8 years, 10 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
« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/compiler_specific.h" 5 #include "base/compiler_specific.h"
6 #include "base/memory/scoped_ptr.h" 6 #include "base/memory/scoped_ptr.h"
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "chrome/browser/chromeos/cros/cros_mock.h" 8 #include "chrome/browser/chromeos/cros/cros_mock.h"
9 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h" 9 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
10 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h" 10 #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 EXPECT_CALL(*mock_login_display_host_, 187 EXPECT_CALL(*mock_login_display_host_,
188 StartWizard(WizardController::kUserImageScreenName, NULL)) 188 StartWizard(WizardController::kUserImageScreenName, NULL))
189 .Times(1); 189 .Times(1);
190 existing_user_controller()->Login(kUsername, kPassword); 190 existing_user_controller()->Login(kUsername, kPassword);
191 } 191 }
192 192
193 IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, AutoEnrollAfterSignIn) { 193 IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, AutoEnrollAfterSignIn) {
194 EXPECT_CALL(*mock_login_display_host_, 194 EXPECT_CALL(*mock_login_display_host_,
195 StartWizard(WizardController::kEnterpriseEnrollmentScreenName, _)) 195 StartWizard(WizardController::kEnterpriseEnrollmentScreenName, _))
196 .Times(1); 196 .Times(1);
197 EXPECT_CALL(*mock_cryptohome_library_, AsyncSetOwnerUser(_, _)).Times(0);
198 existing_user_controller()->DoAutoEnrollment(); 197 existing_user_controller()->DoAutoEnrollment();
199 existing_user_controller()->CompleteLogin(kUsername, kPassword); 198 existing_user_controller()->CompleteLogin(kUsername, kPassword);
200 } 199 }
201 200
202 IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, DontAutoEnrollAfterSignIn) { 201 IN_PROC_BROWSER_TEST_F(ExistingUserControllerTest, DontAutoEnrollAfterSignIn) {
203 EXPECT_CALL(*mock_login_display_host_, 202 EXPECT_CALL(*mock_login_display_host_,
204 StartWizard(WizardController::kEnterpriseEnrollmentScreenName, _)) 203 StartWizard(WizardController::kEnterpriseEnrollmentScreenName, _))
205 .Times(0); 204 .Times(0);
206 EXPECT_CALL(*mock_login_display_host_, 205 EXPECT_CALL(*mock_login_display_host_,
207 StartWizard(WizardController::kUserImageScreenName, _)) 206 StartWizard(WizardController::kUserImageScreenName, _))
208 .Times(1); 207 .Times(1);
209 EXPECT_CALL(*mock_cryptohome_library_, AsyncSetOwnerUser(_, _)).Times(1);
210 existing_user_controller()->CompleteLogin(kUsername, kPassword); 208 existing_user_controller()->CompleteLogin(kUsername, kPassword);
211 } 209 }
212 210
213 } // namespace chromeos 211 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698