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

Side by Side Diff: chrome/browser/chromeos/policy/device_local_account_browsertest.cc

Issue 1693383003: ChromeOS cryptohome should be able to use gaia id as user identifier. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing files. Created 4 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/policy/device_local_account.h" 5 #include "chrome/browser/chromeos/policy/device_local_account.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
724 // Start login into the device-local account. 724 // Start login into the device-local account.
725 chromeos::LoginDisplayHost* host = 725 chromeos::LoginDisplayHost* host =
726 chromeos::LoginDisplayHost::default_host(); 726 chromeos::LoginDisplayHost::default_host();
727 ASSERT_TRUE(host); 727 ASSERT_TRUE(host);
728 host->StartSignInScreen(LoginScreenContext()); 728 host->StartSignInScreen(LoginScreenContext());
729 chromeos::ExistingUserController* controller = 729 chromeos::ExistingUserController* controller =
730 chromeos::ExistingUserController::current_controller(); 730 chromeos::ExistingUserController::current_controller();
731 ASSERT_TRUE(controller); 731 ASSERT_TRUE(controller);
732 732
733 chromeos::UserContext user_context(user_manager::USER_TYPE_PUBLIC_ACCOUNT, 733 chromeos::UserContext user_context(user_manager::USER_TYPE_PUBLIC_ACCOUNT,
734 account_id_1_.GetUserEmail()); 734 account_id_1_);
735 user_context.SetPublicSessionLocale(locale); 735 user_context.SetPublicSessionLocale(locale);
736 user_context.SetPublicSessionInputMethod(input_method); 736 user_context.SetPublicSessionInputMethod(input_method);
737 controller->Login(user_context, chromeos::SigninSpecifics()); 737 controller->Login(user_context, chromeos::SigninSpecifics());
738 } 738 }
739 739
740 void WaitForSessionStart() { 740 void WaitForSessionStart() {
741 if (IsSessionStarted()) 741 if (IsSessionStarted())
742 return; 742 return;
743 content::WindowedNotificationObserver(chrome::NOTIFICATION_SESSION_STARTED, 743 content::WindowedNotificationObserver(chrome::NOTIFICATION_SESSION_STARTED,
744 base::Bind(IsSessionStarted)).Wait(); 744 base::Bind(IsSessionStarted)).Wait();
(...skipping 1686 matching lines...) Expand 10 before | Expand all | Expand 10 after
2431 ASSERT_TRUE(content::ExecuteScript(contents_, 2431 ASSERT_TRUE(content::ExecuteScript(contents_,
2432 "$('tos-accept-button').click();")); 2432 "$('tos-accept-button').click();"));
2433 2433
2434 WaitForSessionStart(); 2434 WaitForSessionStart();
2435 } 2435 }
2436 2436
2437 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance, 2437 INSTANTIATE_TEST_CASE_P(TermsOfServiceDownloadTestInstance,
2438 TermsOfServiceDownloadTest, testing::Bool()); 2438 TermsOfServiceDownloadTest, testing::Bool());
2439 2439
2440 } // namespace policy 2440 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698