Add user_prefs::TestPrefServiceSyncable

chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc

Index: chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc
diff --git a/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc
index 0047fd9e0b4d9dc234f0430e3903dc0bdb09c45b..90354d595be438918f3611d588349e8e2eec9041 100644
--- a/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc
+++ b/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc
@@ -11,9 +11,8 @@
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
-#include "chrome/test/base/testing_pref_service_syncable.h"
-#include "chrome/test/base/testing_profile.h"
 #include "components/google/core/browser/google_switches.h"
+#include "components/pref_registry/testing_pref_service_syncable.h"
 #include "components/search_engines/prepopulated_engines.h"
 #include "components/search_engines/search_terms_data.h"
 #include "grit/generated_resources.h"
@@ -93,12 +92,13 @@ TEST(TemplateURLPrepopulateDataTest, UniqueIDs) {
       'V'<<8|'N', 'V'<<8|'U', 'W'<<8|'F', 'W'<<8|'S', 'Y'<<8|'E',
       'Y'<<8|'T', 'Z'<<8|'A', 'Z'<<8|'M', 'Z'<<8|'W', -1 };
 
-  TestingProfile profile;
+  user_prefs::TestingPrefServiceSyncable prefs;
+  TemplateURLPrepopulateData::RegisterProfilePrefs(prefs.registry());

[Peter Kasting, 2014/06/18 20:27:13]

You seem to do this in every test, so I suggest converting
TemplateURLPrepopulateDataTest to a real subclass of testing::Test so you can
introduce a SetUp() override to do this.

[hashimoto, 2014/06/18 21:09:33]

Done.
Added a test fixture and replaced all TEST with TEST_F

   for (size_t i = 0; i < arraysize(kCountryIds); ++i) {
-    profile.GetPrefs()->SetInteger(prefs::kCountryIDAtInstall, kCountryIds[i]);
+    prefs.SetInteger(prefs::kCountryIDAtInstall, kCountryIds[i]);
     size_t default_index;
     ScopedVector<TemplateURLData> urls =
-        TemplateURLPrepopulateData::GetPrepopulatedEngines(profile.GetPrefs(),
+        TemplateURLPrepopulateData::GetPrepopulatedEngines(&prefs,
                                                            &default_index);
     std::set<int> unique_ids;
     for (size_t turl_i = 0; turl_i < urls.size(); ++turl_i) {
@@ -112,10 +112,10 @@ TEST(TemplateURLPrepopulateDataTest, UniqueIDs) {
 // Verifies that default search providers from the preferences file
 // override the built-in ones.
 TEST(TemplateURLPrepopulateDataTest, ProvidersFromPrefs) {
-  TestingProfile profile;
-  TestingPrefServiceSyncable* prefs = profile.GetTestingPrefService();
-  prefs->SetUserPref(prefs::kSearchProviderOverridesVersion,
-                     base::Value::CreateIntegerValue(1));
+  user_prefs::TestingPrefServiceSyncable prefs;
+  TemplateURLPrepopulateData::RegisterProfilePrefs(prefs.registry());
+  prefs.SetUserPref(prefs::kSearchProviderOverridesVersion,
+                    base::Value::CreateIntegerValue(1));
   base::ListValue* overrides = new base::ListValue;
   scoped_ptr<base::DictionaryValue> entry(new base::DictionaryValue);
   // Set only the minimal required settings for a search provider configuration.
@@ -126,14 +126,15 @@ TEST(TemplateURLPrepopulateDataTest, ProvidersFromPrefs) {
   entry->SetString("encoding", "UTF-8");
   entry->SetInteger("id", 1001);
   overrides->Append(entry->DeepCopy());
-  prefs->SetUserPref(prefs::kSearchProviderOverrides, overrides);
+  prefs.SetUserPref(prefs::kSearchProviderOverrides, overrides);
 
-  int version = TemplateURLPrepopulateData::GetDataVersion(prefs);
+  int version = TemplateURLPrepopulateData::GetDataVersion(&prefs);
   EXPECT_EQ(1, version);
 
   size_t default_index;
   ScopedVector<TemplateURLData> t_urls =
-      TemplateURLPrepopulateData::GetPrepopulatedEngines(prefs, &default_index);
+      TemplateURLPrepopulateData::GetPrepopulatedEngines(&prefs,
+                                                         &default_index);
 
   ASSERT_EQ(1u, t_urls.size());
   EXPECT_EQ(ASCIIToUTF16("foo"), t_urls[0]->short_name);
@@ -156,10 +157,10 @@ TEST(TemplateURLPrepopulateDataTest, ProvidersFromPrefs) {
   entry->SetString("search_terms_replacement_key", "espv");
   overrides = new base::ListValue;
   overrides->Append(entry->DeepCopy());
-  prefs->SetUserPref(prefs::kSearchProviderOverrides, overrides);
+  prefs.SetUserPref(prefs::kSearchProviderOverrides, overrides);
 
   t_urls = TemplateURLPrepopulateData::GetPrepopulatedEngines(
-      profile.GetPrefs(), &default_index);
+      &prefs, &default_index);
   ASSERT_EQ(1u, t_urls.size());
   EXPECT_EQ(ASCIIToUTF16("foo"), t_urls[0]->short_name);
   EXPECT_EQ(ASCIIToUTF16("fook"), t_urls[0]->keyword());
@@ -190,18 +191,19 @@ TEST(TemplateURLPrepopulateDataTest, ProvidersFromPrefs) {
   entry->SetString("keyword", "bazk");
   entry->SetString("encoding", "UTF-8");
   overrides->Append(entry->DeepCopy());
-  prefs->SetUserPref(prefs::kSearchProviderOverrides, overrides);
+  prefs.SetUserPref(prefs::kSearchProviderOverrides, overrides);
 
   t_urls =
-      TemplateURLPrepopulateData::GetPrepopulatedEngines(prefs, &default_index);
+      TemplateURLPrepopulateData::GetPrepopulatedEngines(&prefs,
+                                                         &default_index);
   EXPECT_EQ(2u, t_urls.size());
 }
 
 TEST(TemplateURLPrepopulateDataTest, ClearProvidersFromPrefs) {
-  TestingProfile profile;
-  TestingPrefServiceSyncable* prefs = profile.GetTestingPrefService();
-  prefs->SetUserPref(prefs::kSearchProviderOverridesVersion,
-                     base::Value::CreateIntegerValue(1));
+  user_prefs::TestingPrefServiceSyncable prefs;
+  TemplateURLPrepopulateData::RegisterProfilePrefs(prefs.registry());
+  prefs.SetUserPref(prefs::kSearchProviderOverridesVersion,
+                    base::Value::CreateIntegerValue(1));
   base::ListValue* overrides = new base::ListValue;
   base::DictionaryValue* entry(new base::DictionaryValue);
   // Set only the minimal required settings for a search provider configuration.
@@ -212,20 +214,21 @@ TEST(TemplateURLPrepopulateDataTest, ClearProvidersFromPrefs) {
   entry->SetString("encoding", "UTF-8");
   entry->SetInteger("id", 1001);
   overrides->Append(entry);
-  prefs->SetUserPref(prefs::kSearchProviderOverrides, overrides);
+  prefs.SetUserPref(prefs::kSearchProviderOverrides, overrides);
 
-  int version = TemplateURLPrepopulateData::GetDataVersion(prefs);
+  int version = TemplateURLPrepopulateData::GetDataVersion(&prefs);
   EXPECT_EQ(1, version);
 
   // This call removes the above search engine.
-  TemplateURLPrepopulateData::ClearPrepopulatedEnginesInPrefs(prefs);
+  TemplateURLPrepopulateData::ClearPrepopulatedEnginesInPrefs(&prefs);
 
-  version = TemplateURLPrepopulateData::GetDataVersion(prefs);
+  version = TemplateURLPrepopulateData::GetDataVersion(&prefs);
   EXPECT_EQ(TemplateURLPrepopulateData::kCurrentDataVersion, version);
 
   size_t default_index;
   ScopedVector<TemplateURLData> t_urls =
-      TemplateURLPrepopulateData::GetPrepopulatedEngines(prefs, &default_index);
+      TemplateURLPrepopulateData::GetPrepopulatedEngines(&prefs,
+                                                         &default_index);
   ASSERT_FALSE(t_urls.empty());
   for (size_t i = 0; i < t_urls.size(); ++i) {
     EXPECT_NE(ASCIIToUTF16("foo"), t_urls[i]->short_name);
@@ -250,12 +253,13 @@ TEST(TemplateURLPrepopulateDataTest, ClearProvidersFromPrefs) {
 
 // Verifies that built-in search providers are processed correctly.
 TEST(TemplateURLPrepopulateDataTest, ProvidersFromPrepopulated) {
-  TestingProfile profile;
+  user_prefs::TestingPrefServiceSyncable prefs;
+  TemplateURLPrepopulateData::RegisterProfilePrefs(prefs.registry());
   // Use United States.
-  profile.GetPrefs()->SetInteger(prefs::kCountryIDAtInstall, 'U'<<8|'S');
+  prefs.SetInteger(prefs::kCountryIDAtInstall, 'U'<<8|'S');
   size_t default_index;
   ScopedVector<TemplateURLData> t_urls =
-      TemplateURLPrepopulateData::GetPrepopulatedEngines(profile.GetPrefs(),
+      TemplateURLPrepopulateData::GetPrepopulatedEngines(&prefs,
                                                          &default_index);
 
   // Ensure all the URLs have the required fields populated.