Make extensions DSE persistent in browser prefs

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 78f74c7843d187baef69723203939c6f2a547447..588c9f179fdc6c1a5885fc57dda3f1ed31439875 100644
--- a/chrome/browser/search_engines/template_url_service_sync_unittest.cc
+++ b/chrome/browser/search_engines/template_url_service_sync_unittest.cc
@@ -164,6 +164,9 @@ class TestTemplateURLServiceClient : public TemplateURLServiceClient {
        const base::string16& term) override {}
    void AddKeywordGeneratedVisit(const GURL& url) override {}
    bool IsOmniboxExtensionURL(const std::string& url) override { return false; }
+   std::string GetExtensionControllingDSEPref() override {
+     return std::string();
+   }
 };
 
 }  // namespace
@@ -1706,6 +1709,69 @@ TEST_F(TemplateURLServiceSyncTest, SyncWithManagedDefaultSearch) {
   EXPECT_EQ(expected_default, model()->GetDefaultSearchProvider());
 }
 
+TEST_F(TemplateURLServiceSyncTest, SyncWithExtensionDefaultSearch) {

[vasilii, 2016/12/06 19:16:42]

I meant a different scenario in mind when I asked to write a test.

- Sync is active.
- An extension overrides the DSE.
- Test that the sync model doesn't get this update because we should sync the
extensions and not its settings.

[Alexander Yashkin, 2016/12/09 08:19:52]

Ok, got it, added GetAllSyncDataWithSearchOverrideExtension.

+  // First start off with a few entries and make sure we can set an extension
+  // default search provider.
+  syncer::SyncDataList initial_data = CreateInitialSyncData();
+  model()->MergeDataAndStartSyncing(syncer::SEARCH_ENGINES, initial_data,
+                                    PassProcessor(),
+                                    CreateAndPassSyncErrorFactory());
+  model()->SetUserSelectedDefaultSearchProvider(
+      model()->GetTemplateURLForGUID("key2"));
+
+  EXPECT_EQ(3U, model()->GetAllSyncData(syncer::SEARCH_ENGINES).size());
+  ASSERT_FALSE(model()->is_default_search_managed());
+  ASSERT_TRUE(model()->GetDefaultSearchProvider());
+
+  // Change the default search provider to a extension one.
+  TemplateURLData extension;
+  extension.SetShortName(ASCIIToUTF16("extensiondefault"));
+  extension.SetKeyword(ASCIIToUTF16("extensiondefault"));
+  extension.SetURL("http://extensiondefault.com/search?t={searchTerms}");
+  extension.favicon_url = GURL("http://extensiondefault.com/icon.jpg");
+  extension.input_encodings = {"UTF-16", "UTF-32"};
+  extension.alternate_urls = {
+      "http://extensiondefault.com/search#t={searchTerms}"};
+  extension.search_terms_replacement_key = "espv";

[vasilii, 2016/12/06 19:16:42]

Do you wanna use your helper function here?

[Alexander Yashkin, 2016/12/09 08:19:52]

Done

+
+  auto ext_dse = base::MakeUnique<TemplateURL>(
+      extension, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION);
+  auto ext_info = base::MakeUnique<TemplateURL::AssociatedExtensionInfo>("ext");
+  ext_info->wants_to_be_default_engine = true;
+  test_util_a_->AddExtensionControlledTURL(std::move(ext_dse),
+                                           std::move(ext_info));
+
+  const TemplateURL* dsp_turl = model()->GetDefaultSearchProvider();
+  EXPECT_TRUE(model()->IsExtensionControlledDefaultSearch());
+
+  // Add a new entry from Sync. It should still sync in despite the default
+  // being extension controlled.
+  syncer::SyncChangeList changes;
+  changes.push_back(CreateTestSyncChange(
+      syncer::SyncChange::ACTION_ADD,
+      CreateTestTemplateURL(ASCIIToUTF16("newkeyword"),
+                            "http://new.com/{searchTerms}", "newdefault")));
+  model()->ProcessSyncChanges(FROM_HERE, changes);
+
+  EXPECT_EQ(4U, model()->GetAllSyncData(syncer::SEARCH_ENGINES).size());
+
+  // Change kSyncedDefaultSearchProviderGUID to point to the new entry and
+  // ensure that the DSP remains extension controlled.
+  profile_a()->GetTestingPrefService()->SetString(
+      prefs::kSyncedDefaultSearchProviderGUID, "newdefault");
+
+  EXPECT_EQ(dsp_turl, model()->GetDefaultSearchProvider());
+  EXPECT_TRUE(model()->IsExtensionControlledDefaultSearch());
+
+  // Remove extension DSE. Ensure that the DSP changes to the expected pending
+  // entry from Sync.
+  const TemplateURL* expected_default =
+      model()->GetTemplateURLForGUID("newdefault");
+  test_util_a_->RemoveExtensionDefaultSearchFromPrefs("ext");
+
+  EXPECT_EQ(expected_default, model()->GetDefaultSearchProvider());
+}
+
 TEST_F(TemplateURLServiceSyncTest, SyncMergeDeletesDefault) {
   // If the value from Sync is a duplicate of the local default and is newer, it
   // should safely replace the local value and set as the new default.