Changed keywords conflicts resolution for extensions search engines.

components/search_engines/search_engines_test_util.cc

Index: components/search_engines/search_engines_test_util.cc
diff --git a/components/search_engines/search_engines_test_util.cc b/components/search_engines/search_engines_test_util.cc
index d427a009d0c846dc8a8bee31b18d2724c9856b7f..01b7d5009f100c9db2c678f05e684ced2f673ead 100644
--- a/components/search_engines/search_engines_test_util.cc
+++ b/components/search_engines/search_engines_test_util.cc
@@ -15,14 +15,13 @@
 #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"};