Changed keywords conflicts resolution for extensions search engines.

chrome/browser/extensions/api/omnibox/omnibox_api.cc

Index: chrome/browser/extensions/api/omnibox/omnibox_api.cc
diff --git a/chrome/browser/extensions/api/omnibox/omnibox_api.cc b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
index d954ed0be435dbf8b36cc135f25ec4d0c7b2dac2..a4c0a2919068081b3b490062d4e61cd577dd1d08 100644
--- a/chrome/browser/extensions/api/omnibox/omnibox_api.cc
+++ b/chrome/browser/extensions/api/omnibox/omnibox_api.cc
@@ -219,7 +219,8 @@ void OmniboxAPI::OnExtensionLoaded(content::BrowserContext* browser_context,
       if (url_service_->loaded()) {
         url_service_->RegisterOmniboxKeyword(
             extension->id(), extension->name(), keyword,
-            GetTemplateURLStringForExtension(extension->id()));
+            GetTemplateURLStringForExtension(extension->id()),
+            ExtensionPrefs::Get(profile_)->GetInstallTime(extension->id()));
       } else {
         pending_extensions_.insert(extension);
       }
@@ -247,11 +248,11 @@ gfx::Image OmniboxAPI::GetOmniboxIcon(const std::string& extension_id) {
 void OmniboxAPI::OnTemplateURLsLoaded() {
   // Register keywords for pending extensions.
   template_url_sub_.reset();
-  for (PendingExtensions::const_iterator i(pending_extensions_.begin());
-       i != pending_extensions_.end(); ++i) {
+  for (const auto i : pending_extensions_) {

[Peter Kasting, 2017/02/25 04:26:53]

Nit: Should (I think) be const auto*

[Alexander Yashkin, 2017/02/25 11:34:06]

Done.

     url_service_->RegisterOmniboxKeyword(
-        (*i)->id(), (*i)->name(), OmniboxInfo::GetKeyword(*i),
-        GetTemplateURLStringForExtension((*i)->id()));
+        i->id(), i->name(), OmniboxInfo::GetKeyword(i),
+        GetTemplateURLStringForExtension(i->id()),
+        ExtensionPrefs::Get(profile_)->GetInstallTime(i->id()));
   }
   pending_extensions_.clear();
 }