Changed keywords conflicts resolution for extensions search engines.

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"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_data.h"
 #include "components/search_engines/template_url_data_util.h"
 #include "components/sync_preferences/testing_pref_service_syncable.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 std::unique_ptr<TemplateURLData> GenerateDummyTemplateURLData(
-    const std::string& provider_name) {
+    const std::string& keyword) {
   auto data = base::MakeUnique<TemplateURLData>();
-  data->SetShortName(base::UTF8ToUTF16(provider_name + "name"));
-  data->SetKeyword(base::UTF8ToUTF16(provider_name + "key"));
-  data->SetURL(std::string("http://") + provider_name + "foo/{searchTerms}");
-  data->suggestions_url = std::string("http://") + provider_name + "sugg";
-  data->alternate_urls.push_back(std::string("http://") + provider_name +
-                                 "foo/alt");
+  data->SetShortName(base::UTF8ToUTF16(keyword + "name"));
+  data->SetKeyword(base::UTF8ToUTF16(keyword));
+  data->SetURL(std::string("http://") + keyword + "foo/{searchTerms}");
+  data->suggestions_url = std::string("http://") + keyword + "sugg";
+  data->alternate_urls.push_back(std::string("http://") + keyword + "foo/alt");
   data->favicon_url = GURL("http://icon1");
   data->safe_for_autoreplace = true;
   data->input_encodings = {"UTF-8", "UTF-16"};
   data->date_created = base::Time();
   data->last_modified = base::Time();
   return data;
 }
 
 void ExpectSimilar(const TemplateURLData* expected,
                    const TemplateURLData* actual) {
@@ skipping 31 matching lines @@
   prefs->SetExtensionPref(
       DefaultSearchManager::kDefaultSearchProviderDataPrefName,
       entry.release());
 }
 
 void RemoveExtensionDefaultSearchFromPrefs(
     sync_preferences::TestingPrefServiceSyncable* prefs) {
   prefs->RemoveExtensionPref(
       DefaultSearchManager::kDefaultSearchProviderDataPrefName);
 }