Changed keywords conflicts resolution for extensions search engines.

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

 // Copyright (c) 2012 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 "chrome/browser/extensions/api/omnibox/omnibox_api.h"
 
 #include <stddef.h>
 
 #include <utility>
 
@@ skipping 201 matching lines @@
   const std::string& keyword = OmniboxInfo::GetKeyword(extension);
   if (!keyword.empty()) {
     // Load the omnibox icon so it will be ready to display in the URL bar.
     omnibox_icon_manager_.LoadIcon(profile_, extension);
 
     if (url_service_) {
       url_service_->Load();
       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);
       }
     }
   }
 }
 
 void OmniboxAPI::OnExtensionUnloaded(content::BrowserContext* browser_context,
                                      const Extension* extension,
                                      UnloadedExtensionInfo::Reason reason) {
   if (!OmniboxInfo::GetKeyword(extension).empty() && url_service_) {
     if (url_service_->loaded()) {
       url_service_->RemoveExtensionControlledTURL(
           extension->id(), TemplateURL::OMNIBOX_API_EXTENSION);
     } else {
       pending_extensions_.erase(extension);
     }
   }
 }
 
 gfx::Image OmniboxAPI::GetOmniboxIcon(const std::string& extension_id) {
   return omnibox_icon_manager_.GetIcon(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();
 }
 
 template <>
 void BrowserContextKeyedAPIFactory<OmniboxAPI>::DeclareFactoryDependencies() {
   DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
   DependsOn(ExtensionPrefsFactory::GetInstance());
   DependsOn(TemplateURLServiceFactory::GetInstance());
 }
@@ skipping 109 matching lines @@
     for (size_t i = 0; i < description_styles.size(); ++i) {
       if (description_styles[i].offset > placeholder)
         description_styles[i].offset += replacement.length() - 2;
     }
   }
 
   match->contents.assign(description);
 }
 
 }  // namespace extensions