Make extensions DSE persistent in browser prefs (Reland)

components/search_engines/search_engines_test_util.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/search_engines/search_engines_test_util.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/search_engines/default_search_manager.h"
@@ skipping 36 matching lines @@
   EXPECT_EQ(expected->search_url_post_params, actual->search_url_post_params);
   EXPECT_EQ(expected->suggestions_url_post_params,
             actual->suggestions_url_post_params);
   EXPECT_EQ(expected->instant_url_post_params, actual->instant_url_post_params);
   EXPECT_EQ(expected->image_url_post_params, actual->image_url_post_params);
 
   EXPECT_EQ(expected->favicon_url, actual->favicon_url);
   EXPECT_EQ(expected->safe_for_autoreplace, actual->safe_for_autoreplace);
   EXPECT_EQ(expected->input_encodings, actual->input_encodings);
   EXPECT_EQ(expected->alternate_urls, actual->alternate_urls);
-  EXPECT_EQ(expected->search_terms_replacement_key,
-            actual->search_terms_replacement_key);
+  EXPECT_TRUE(TemplateURL::SearchTermsReplacementKeysMatch(
+      expected->search_terms_replacement_key,
+      actual->search_terms_replacement_key));
 }
 
 void SetExtensionDefaultSearchInPrefs(
     sync_preferences::TestingPrefServiceSyncable* prefs,
     const TemplateURLData& data) {
   std::unique_ptr<base::DictionaryValue> entry =
       TemplateURLDataToDictionary(data);
   prefs->SetExtensionPref(
       DefaultSearchManager::kDefaultSearchProviderDataPrefName,
       entry.release());
 }
 
 void RemoveExtensionDefaultSearchFromPrefs(
     sync_preferences::TestingPrefServiceSyncable* prefs) {
   prefs->RemoveExtensionPref(
       DefaultSearchManager::kDefaultSearchProviderDataPrefName);
 }