Changed keywords conflicts resolution for extensions search engines.

components/search_engines/search_engines_test_util.h

Index: components/search_engines/search_engines_test_util.h
diff --git a/components/search_engines/search_engines_test_util.h b/components/search_engines/search_engines_test_util.h
index 7ddcd50d52f854042098eeeda8ca4da9c1002b58..c04352aa2f92c8092b2257f7ac3d3ebfa27ecfaa 100644
--- a/components/search_engines/search_engines_test_util.h
+++ b/components/search_engines/search_engines_test_util.h
@@ -17,7 +17,7 @@ class TestingPrefServiceSyncable;
 // Generates a TemplateURLData structure useful for tests filled with values
 // autogenerated from |provider_name|.
 std::unique_ptr<TemplateURLData> GenerateDummyTemplateURLData(
-    const std::string& provider_name);
+    const std::string& keyword);
 
 // Checks that the two TemplateURLs are similar. Does not check the id, the
 // date_created or the last_modified time.  Neither pointer should be null.