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

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

Issue 1887953002: Revert of [Merge to M50] Enable bootstrapping feature by default. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661
Patch Set: Created 4 years, 8 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/app/chromeos_strings.grdp ('k') | chrome/browser/chromeos/login/startup_utils.cc » ('j') | 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 <string> 5 #include <string>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after
411 void TearDownOnMainThread() override { 411 void TearDownOnMainThread() override {
412 ExistingUserControllerTest::TearDownOnMainThread(); 412 ExistingUserControllerTest::TearDownOnMainThread();
413 413
414 // Test case may be configured with the real user manager but empty user 414 // Test case may be configured with the real user manager but empty user
415 // list initially. So network OOBE screen is initialized. 415 // list initially. So network OOBE screen is initialized.
416 // Need to reset it manually so that we don't end up with CrosSettings 416 // Need to reset it manually so that we don't end up with CrosSettings
417 // observer that wasn't removed. 417 // observer that wasn't removed.
418 WizardController* controller = WizardController::default_controller(); 418 WizardController* controller = WizardController::default_controller();
419 if (controller && controller->current_screen()) 419 if (controller && controller->current_screen())
420 controller->current_screen()->Hide(); 420 controller->current_screen()->Hide();
421
422 if (LoginDisplayHost::default_host())
423 LoginDisplayHost::default_host()->Finalize();
424 base::MessageLoop::current()->RunUntilIdle();
425 } 421 }
426 422
427 void ExpectSuccessfulLogin(const UserContext& user_context) { 423 void ExpectSuccessfulLogin(const UserContext& user_context) {
428 test::UserSessionManagerTestApi session_manager_test_api( 424 test::UserSessionManagerTestApi session_manager_test_api(
429 UserSessionManager::GetInstance()); 425 UserSessionManager::GetInstance());
430 session_manager_test_api.InjectStubUserContext(user_context); 426 session_manager_test_api.InjectStubUserContext(user_context);
431 EXPECT_CALL(*mock_login_display_host_, 427 EXPECT_CALL(*mock_login_display_host_,
432 StartWizard(WizardController::kTermsOfServiceScreenName)) 428 StartWizard(WizardController::kTermsOfServiceScreenName))
433 .Times(0); 429 .Times(0);
434 EXPECT_CALL(*mock_login_display_, SetUIEnabled(false)).Times(AnyNumber()); 430 EXPECT_CALL(*mock_login_display_, SetUIEnabled(false)).Times(AnyNumber());
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
739 PRE_TestLoadingPublicUsersFromLocalState) { 735 PRE_TestLoadingPublicUsersFromLocalState) {
740 // First run propagates public accounts and stores them in Local State. 736 // First run propagates public accounts and stores them in Local State.
741 } 737 }
742 738
743 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest, 739 IN_PROC_BROWSER_TEST_F(ExistingUserControllerPublicSessionTest,
744 TestLoadingPublicUsersFromLocalState) { 740 TestLoadingPublicUsersFromLocalState) {
745 // Second run loads list of public accounts from Local State. 741 // Second run loads list of public accounts from Local State.
746 } 742 }
747 743
748 } // namespace chromeos 744 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/app/chromeos_strings.grdp ('k') | chrome/browser/chromeos/login/startup_utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698