Refactor search_engines tests to better reuse code

chrome/browser/search_engines/template_url_service_sync_unittest.cc

Index: chrome/browser/search_engines/template_url_service_sync_unittest.cc
diff --git a/chrome/browser/search_engines/template_url_service_sync_unittest.cc b/chrome/browser/search_engines/template_url_service_sync_unittest.cc
index 8a1a1f699d17175660dbc22de3a805fb9f980fcb..5be5cfe053ebf53482e0f48a9d551cea97464636 100644
--- a/chrome/browser/search_engines/template_url_service_sync_unittest.cc
+++ b/chrome/browser/search_engines/template_url_service_sync_unittest.cc
@@ -1663,16 +1663,18 @@ TEST_F(TemplateURLServiceSyncTest, SyncWithManagedDefaultSearch) {
   ASSERT_TRUE(model()->GetDefaultSearchProvider());
 
   // Change the default search provider to a managed one.
-  const char kName[] = "manageddefault";
-  const char kSearchURL[] = "http://manageddefault.com/search?t={searchTerms}";
-  const char kIconURL[] = "http://manageddefault.com/icon.jpg";
-  const char kEncodings[] = "UTF-16;UTF-32";
-  const char kAlternateURL[] =
-      "http://manageddefault.com/search#t={searchTerms}";
-  const char kSearchTermsReplacementKey[] = "espv";
-  test_util_a_->SetManagedDefaultSearchPreferences(true, kName, kName,
-      kSearchURL, std::string(), kIconURL, kEncodings, kAlternateURL,
-      kSearchTermsReplacementKey);
+  TemplateURLData managed;
+  managed.SetShortName(ASCIIToUTF16("manageddefault"));
+  managed.SetKeyword(ASCIIToUTF16("manageddefault"));
+  managed.SetURL("http://manageddefault.com/search?t={searchTerms}");
+  managed.favicon_url = GURL("http://manageddefault.com/icon.jpg");
+  managed.input_encodings.push_back("UTF-16");
+  managed.input_encodings.push_back("UTF-32");

[Peter Kasting, 2016/11/30 00:50:37]

Nit: Can this just be:

  managed.input_encodings = {"UTF-16", "UTF-32"};

?  That seems a bit easier to read.

(For similarity, we could probably use the same kind of syntax with the
|alternate_urls| field below.)

[Alexander Yashkin, 2016/11/30 06:01:20]

Done, cool new syntax, short and clear.

+  managed.alternate_urls.push_back(
+      "http://manageddefault.com/search#t={searchTerms}");
+  managed.search_terms_replacement_key = "espv";
+
+  SetManagedDefaultSearchPreferences(managed, true, test_util_a_->profile());
   const TemplateURL* dsp_turl = model()->GetDefaultSearchProvider();
 
   EXPECT_TRUE(model()->is_default_search_managed());
@@ -1701,7 +1703,7 @@ TEST_F(TemplateURLServiceSyncTest, SyncWithManagedDefaultSearch) {
   // from Sync.
   const TemplateURL* expected_default =
       model()->GetTemplateURLForGUID("newdefault");
-  test_util_a_->RemoveManagedDefaultSearchPreferences();
+  RemoveManagedDefaultSearchPreferences(test_util_a_->profile());
 
   EXPECT_EQ(expected_default, model()->GetDefaultSearchProvider());
 }