Merge Chromium at r65505: Initial merge by git.

Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45

1 files changed, 4 insertions, 3 deletions

diff --git a/chrome/browser/search_engines/template_url_model.h b/chrome/browser/search_engines/template_url_model.h
index ce9a874..a16bad7 100644
--- a/chrome/browser/search_engines/template_url_model.h
+++ b/chrome/browser/search_engines/template_url_model.h
@@ -144,16 +144,17 @@ class TemplateURLModel : public WebDataServiceConsumer,
   // If the given extension has an omnibox keyword, adds a TemplateURL for that
   // keyword. Only 1 keyword is allowed for a given extension. If the keyword
   // already exists for this extension, does nothing.
-  void RegisterExtensionKeyword(Extension* extension);
+  void RegisterExtensionKeyword(const Extension* extension);
 
   // Removes the TemplateURL containing the keyword for the given extension,
   // if any.
-  void UnregisterExtensionKeyword(Extension* extension);
+  void UnregisterExtensionKeyword(const Extension* extension);
 
   // Returns the TemplateURL associated with the keyword for this extension.
   // This works by checking the extension ID, not the keyword, so it will work
   // even if the user changed the keyword.
-  const TemplateURL* GetTemplateURLForExtension(Extension* extension) const;
+  const TemplateURL* GetTemplateURLForExtension(
+      const Extension* extension) const;
 
   // Returns the set of URLs describing the keywords. The elements are owned
   // by TemplateURLModel and should not be deleted.