| Index: components/search_engines/default_search_manager_unittest.cc
|
| diff --git a/components/search_engines/default_search_manager_unittest.cc b/components/search_engines/default_search_manager_unittest.cc
|
| index 01fcb79dd778e5f5b23d31d8a96b1f995208b039..a8611d775e2bb715b93ac00bce9269858992aa4b 100644
|
| --- a/components/search_engines/default_search_manager_unittest.cc
|
| +++ b/components/search_engines/default_search_manager_unittest.cc
|
| @@ -15,11 +15,11 @@
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "base/time/time.h"
|
| #include "components/pref_registry/pref_registry_syncable.h"
|
| -#include "components/pref_registry/testing_pref_service_syncable.h"
|
| #include "components/search_engines/search_engines_pref_names.h"
|
| #include "components/search_engines/template_url_data.h"
|
| #include "components/search_engines/template_url_data_util.h"
|
| #include "components/search_engines/template_url_prepopulate_data.h"
|
| +#include "components/sync_preferences/testing_pref_service_syncable.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| namespace {
|
| @@ -49,7 +49,8 @@ void ExpectSimilar(const TemplateURLData* expected,
|
| }
|
|
|
| // TODO(caitkp): TemplateURLData-ify this.
|
| -void SetOverrides(user_prefs::TestingPrefServiceSyncable* prefs, bool update) {
|
| +void SetOverrides(sync_preferences::TestingPrefServiceSyncable* prefs,
|
| + bool update) {
|
| prefs->SetUserPref(prefs::kSearchProviderOverridesVersion,
|
| new base::FundamentalValue(1));
|
| base::ListValue* overrides = new base::ListValue;
|
| @@ -83,7 +84,7 @@ void SetOverrides(user_prefs::TestingPrefServiceSyncable* prefs, bool update) {
|
| prefs->SetUserPref(prefs::kSearchProviderOverrides, overrides);
|
| }
|
|
|
| -void SetPolicy(user_prefs::TestingPrefServiceSyncable* prefs,
|
| +void SetPolicy(sync_preferences::TestingPrefServiceSyncable* prefs,
|
| bool enabled,
|
| TemplateURLData* data) {
|
| if (enabled) {
|
| @@ -122,17 +123,17 @@ class DefaultSearchManagerTest : public testing::Test {
|
| DefaultSearchManagerTest() {};
|
|
|
| void SetUp() override {
|
| - pref_service_.reset(new user_prefs::TestingPrefServiceSyncable);
|
| + pref_service_.reset(new sync_preferences::TestingPrefServiceSyncable);
|
| DefaultSearchManager::RegisterProfilePrefs(pref_service_->registry());
|
| TemplateURLPrepopulateData::RegisterProfilePrefs(pref_service_->registry());
|
| }
|
|
|
| - user_prefs::TestingPrefServiceSyncable* pref_service() {
|
| + sync_preferences::TestingPrefServiceSyncable* pref_service() {
|
| return pref_service_.get();
|
| }
|
|
|
| private:
|
| - std::unique_ptr<user_prefs::TestingPrefServiceSyncable> pref_service_;
|
| + std::unique_ptr<sync_preferences::TestingPrefServiceSyncable> pref_service_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DefaultSearchManagerTest);
|
| };
|
|
|