diff options
Diffstat (limited to 'chrome')
6 files changed, 7 insertions, 7 deletions
diff --git a/chrome/browser/chromeos/arc/arc_auth_service.cc b/chrome/browser/chromeos/arc/arc_auth_service.cc index 55f2baf..82ae12c 100644 --- a/chrome/browser/chromeos/arc/arc_auth_service.cc +++ b/chrome/browser/chromeos/arc/arc_auth_service.cc @@ -6,12 +6,12 @@ #include <utility> -#include "base/prefs/pref_service.h" #include "chrome/browser/chromeos/arc/arc_auth_ui.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "components/arc/arc_bridge_service.h" #include "components/pref_registry/pref_registry_syncable.h" +#include "components/prefs/pref_service.h" namespace arc { diff --git a/chrome/browser/chromeos/arc/arc_auth_service.h b/chrome/browser/chromeos/arc/arc_auth_service.h index 37f70b4e..1e3eea4 100644 --- a/chrome/browser/chromeos/arc/arc_auth_service.h +++ b/chrome/browser/chromeos/arc/arc_auth_service.h @@ -9,13 +9,13 @@ #include "base/macros.h" #include "base/observer_list.h" -#include "base/prefs/pref_change_registrar.h" #include "base/threading/thread_checker.h" #include "chrome/browser/chromeos/arc/arc_auth_ui.h" #include "components/arc/arc_bridge_service.h" #include "components/arc/arc_service.h" #include "components/arc/auth/arc_auth_fetcher.h" #include "components/arc/common/auth.mojom.h" +#include "components/prefs/pref_change_registrar.h" #include "mojo/public/cpp/bindings/binding.h" class PrefService; diff --git a/chrome/browser/chromeos/arc/arc_auth_service_unittest.cc b/chrome/browser/chromeos/arc/arc_auth_service_unittest.cc index 822b7fa..22b329c1 100644 --- a/chrome/browser/chromeos/arc/arc_auth_service_unittest.cc +++ b/chrome/browser/chromeos/arc/arc_auth_service_unittest.cc @@ -10,7 +10,6 @@ #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/macros.h" -#include "base/prefs/pref_service.h" #include "base/run_loop.h" #include "chrome/browser/chromeos/arc/arc_auth_service.h" #include "chrome/browser/profiles/profile.h" @@ -19,6 +18,7 @@ #include "components/arc/arc_bridge_service.h" #include "components/arc/auth/arc_auth_fetcher.h" #include "components/arc/test/fake_arc_bridge_service.h" +#include "components/prefs/pref_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/gaia/gaia_constants.h" diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc index 01ec241..f447b91 100644 --- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc @@ -907,7 +907,7 @@ class WizardControllerBrokenLocalStateTest : public WizardControllerTest { } void SetUpOnMainThread() override { - base::PrefServiceFactory factory; + PrefServiceFactory factory; factory.set_user_prefs(make_scoped_refptr(new PrefStoreStub())); local_state_ = factory.Create(new PrefRegistrySimple()); WizardController::set_local_state_for_testing(local_state_.get()); diff --git a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc index 0d83b65..bfd5e36 100644 --- a/chrome/browser/prefs/profile_pref_store_manager_unittest.cc +++ b/chrome/browser/prefs/profile_pref_store_manager_unittest.cc @@ -144,7 +144,7 @@ class ProfilePrefStoreManagerTest : public testing::Test { void VerifyResetRecorded(bool reset_expected) { EXPECT_EQ(reset_expected, reset_recorded_); - base::PrefServiceFactory pref_service_factory; + PrefServiceFactory pref_service_factory; pref_service_factory.set_user_prefs(pref_store_); scoped_ptr<PrefService> pref_service( @@ -158,7 +158,7 @@ class ProfilePrefStoreManagerTest : public testing::Test { void ClearResetRecorded() { reset_recorded_ = false; - base::PrefServiceFactory pref_service_factory; + PrefServiceFactory pref_service_factory; pref_service_factory.set_user_prefs(pref_store_); scoped_ptr<PrefService> pref_service( diff --git a/chrome/browser/ui/app_list/app_list_service_unittest.cc b/chrome/browser/ui/app_list/app_list_service_unittest.cc index 0683b38..2e8f039e 100644 --- a/chrome/browser/ui/app_list/app_list_service_unittest.cc +++ b/chrome/browser/ui/app_list/app_list_service_unittest.cc @@ -100,7 +100,7 @@ class AppListServiceUnitTest : public testing::Test { AppListService::RegisterPrefs(pref_registry); profiles::RegisterPrefs(pref_registry); - base::PrefServiceFactory factory; + PrefServiceFactory factory; factory.set_user_prefs(make_scoped_refptr(new TestingPrefStore)); local_state_ = factory.Create(pref_registry); |