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

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

Issue 1662843002: Revert of Delete base/prefs and update callers to use components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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) 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/wizard_controller.h" 5 #include "chrome/browser/chromeos/login/wizard_controller.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 889 matching lines...) Expand 10 before | Expand all | Expand 10 after
900 900
901 void SetUpInProcessBrowserTestFixture() override { 901 void SetUpInProcessBrowserTestFixture() override {
902 WizardControllerTest::SetUpInProcessBrowserTestFixture(); 902 WizardControllerTest::SetUpInProcessBrowserTestFixture();
903 903
904 fake_session_manager_client_ = new FakeSessionManagerClient; 904 fake_session_manager_client_ = new FakeSessionManagerClient;
905 DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient( 905 DBusThreadManager::GetSetterForTesting()->SetSessionManagerClient(
906 scoped_ptr<SessionManagerClient>(fake_session_manager_client_)); 906 scoped_ptr<SessionManagerClient>(fake_session_manager_client_));
907 } 907 }
908 908
909 void SetUpOnMainThread() override { 909 void SetUpOnMainThread() override {
910 PrefServiceFactory factory; 910 base::PrefServiceFactory factory;
911 factory.set_user_prefs(make_scoped_refptr(new PrefStoreStub())); 911 factory.set_user_prefs(make_scoped_refptr(new PrefStoreStub()));
912 local_state_ = factory.Create(new PrefRegistrySimple()); 912 local_state_ = factory.Create(new PrefRegistrySimple());
913 WizardController::set_local_state_for_testing(local_state_.get()); 913 WizardController::set_local_state_for_testing(local_state_.get());
914 914
915 WizardControllerTest::SetUpOnMainThread(); 915 WizardControllerTest::SetUpOnMainThread();
916 916
917 // Make sure that OOBE is run as an "official" build. 917 // Make sure that OOBE is run as an "official" build.
918 WizardController::default_controller()->is_official_build_ = true; 918 WizardController::default_controller()->is_official_build_ = true;
919 } 919 }
920 920
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
1220 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when 1220 // TODO(merkulova): Add tests for bluetooth HID detection screen variations when
1221 // UI and logic is ready. http://crbug.com/127016 1221 // UI and logic is ready. http://crbug.com/127016
1222 1222
1223 // TODO(dzhioev): Add tests for controller/host pairing flow. 1223 // TODO(dzhioev): Add tests for controller/host pairing flow.
1224 // http://crbug.com/375191 1224 // http://crbug.com/375191
1225 1225
1226 static_assert(BaseScreenDelegate::EXIT_CODES_COUNT == 23, 1226 static_assert(BaseScreenDelegate::EXIT_CODES_COUNT == 23,
1227 "tests for new control flow are missing"); 1227 "tests for new control flow are missing");
1228 1228
1229 } // namespace chromeos 1229 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/arc/arc_auth_service_unittest.cc ('k') | chrome/browser/prefs/profile_pref_store_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698