Make extensions DSE persistent in browser prefs

chrome/browser/search_engines/template_url_service_test_util.cc

Index: chrome/browser/search_engines/template_url_service_test_util.cc
diff --git a/chrome/browser/search_engines/template_url_service_test_util.cc b/chrome/browser/search_engines/template_url_service_test_util.cc
index 74b8b613f65c8122d546ef857a553a69aa90aeee..57759e554056f36ef36ac611456b8327a644dbe2 100644
--- a/chrome/browser/search_engines/template_url_service_test_util.cc
+++ b/chrome/browser/search_engines/template_url_service_test_util.cc
@@ -127,6 +127,7 @@ void TemplateURLServiceTestUtil::ResetModel(bool verify_load) {
   if (model_)
     ClearModel();
   search_terms_data_ = new TestingSearchTermsData("http://www.google.com/");
+
   model_.reset(new TemplateURLService(
       profile()->GetPrefs(),
       std::unique_ptr<SearchTermsData>(search_terms_data_),
@@ -154,3 +155,46 @@ void TemplateURLServiceTestUtil::SetGoogleBaseURL(const GURL& base_url) {
   search_terms_data_->set_google_base_url(base_url.spec());
   model_->GoogleBaseURLChanged();
 }
+
+void TemplateURLServiceTestUtil::SetExtensionDefaultSearchInPrefs(
+    const std::string& ext_id,
+    const TemplateURLData& ext_data) {
+  std::unique_ptr<base::DictionaryValue> dict =
+      TemplateURLDataToDictionary(ext_data);
+  // Set extension overriden value in test pref service.
+  profile()->GetTestingPrefService()->SetExtensionPref(
+      DefaultSearchManager::kDefaultSearchProviderDataPrefName, dict.release());
+}
+
+void TemplateURLServiceTestUtil::RemoveExtensionDefaultSearchFromPrefs(
+    const std::string& ext_id) {
+  profile()->GetTestingPrefService()->RemoveExtensionPref(
+      DefaultSearchManager::kDefaultSearchProviderDataPrefName);
+}
+
+TemplateURL* TemplateURLServiceTestUtil::AddExtensionControlledTURL(
+    std::unique_ptr<TemplateURL> ext_dse,
+    std::unique_ptr<TemplateURL::AssociatedExtensionInfo> ext_info) {
+  TemplateURL::AssociatedExtensionInfo ext_info_copy = *ext_info;
+  TemplateURLData ext_data = ext_dse->data();
+  TemplateURL* result = model()->AddExtensionControlledTURL(
+      std::move(ext_dse), std::move(ext_info));
+  if (ext_info_copy.wants_to_be_default_engine) {
+    // Set extension overriden DSE value to prefs.

[Peter Kasting, 2016/12/22 20:49:03]

Nit: This comment seems to just restate the function name below.  Is it really
adding anything?

[Alexander Yashkin, 2016/12/23 19:44:08]

Removed

+    SetExtensionDefaultSearchInPrefs(ext_info_copy.extension_id, ext_data);
+  }
+  return result;
+}
+
+void TemplateURLServiceTestUtil::RemoveExtensionControlledTURL(
+    const std::string& ext_id) {
+  TemplateURL* ext_turl = model()->FindTemplateURLForExtension(
+      ext_id, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION);
+  ASSERT_TRUE(ext_turl);
+  ASSERT_TRUE(ext_turl->GetExtensionInfoForTesting());
+  if (ext_turl->GetExtensionInfoForTesting()->wants_to_be_default_engine) {

[Peter Kasting, 2016/12/22 20:49:03]

Nit: No {}

[Alexander Yashkin, 2016/12/23 19:44:08]

Removed

+    RemoveExtensionDefaultSearchFromPrefs(ext_id);
+  }
+  model()->RemoveExtensionControlledTURL(
+      ext_id, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION);
+}