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

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

Issue 64193003: Clean up PrefServiceBuilder (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/compiler_specific.h" 7 #include "base/compiler_specific.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/prefs/pref_registry_simple.h" 9 #include "base/prefs/pref_registry_simple.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after
410 410
411 FakeDBusThreadManager* fake_dbus_thread_manager = 411 FakeDBusThreadManager* fake_dbus_thread_manager =
412 new FakeDBusThreadManager(); 412 new FakeDBusThreadManager();
413 fake_session_manager_client_ = 413 fake_session_manager_client_ =
414 fake_dbus_thread_manager->fake_session_manager_client(); 414 fake_dbus_thread_manager->fake_session_manager_client();
415 DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager); 415 DBusThreadManager::InitializeForTesting(fake_dbus_thread_manager);
416 } 416 }
417 417
418 virtual void SetUpOnMainThread() OVERRIDE { 418 virtual void SetUpOnMainThread() OVERRIDE {
419 PrefServiceBuilder builder; 419 PrefServiceBuilder builder;
420 local_state_.reset(builder 420 builder.set_user_prefs(base::make_scoped_refptr(new PrefStoreStub()));
421 .WithUserPrefs(new PrefStoreStub()) 421 local_state_.reset(builder.Create(new PrefRegistrySimple()));
422 .Create(new PrefRegistrySimple()));
423 WizardController::set_local_state_for_testing(local_state_.get()); 422 WizardController::set_local_state_for_testing(local_state_.get());
424 423
425 WizardControllerTest::SetUpOnMainThread(); 424 WizardControllerTest::SetUpOnMainThread();
426 425
427 // Make sure that OOBE is run as an "official" build. 426 // Make sure that OOBE is run as an "official" build.
428 WizardController::default_controller()->is_official_build_ = true; 427 WizardController::default_controller()->is_official_build_ = true;
429 } 428 }
430 429
431 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE { 430 virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
432 WizardControllerTest::TearDownInProcessBrowserTestFixture(); 431 WizardControllerTest::TearDownInProcessBrowserTestFixture();
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 } 616 }
618 617
619 // TODO(dzhioev): Add test emaulating device with wrong HWID. 618 // TODO(dzhioev): Add test emaulating device with wrong HWID.
620 619
621 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571 620 // TODO(nkostylev): Add test for WebUI accelerators http://crosbug.com/22571
622 621
623 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 18, 622 COMPILE_ASSERT(ScreenObserver::EXIT_CODES_COUNT == 18,
624 add_tests_for_new_control_flow_you_just_introduced); 623 add_tests_for_new_control_flow_you_just_introduced);
625 624
626 } // namespace chromeos 625 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698