Remove the "autogenerate keyword" bit on TemplateURL.

chrome/browser/search_engines/search_provider_install_data.cc

Index: chrome/browser/search_engines/search_provider_install_data.cc
===================================================================
--- chrome/browser/search_engines/search_provider_install_data.cc	(revision 135424)
+++ chrome/browser/search_engines/search_provider_install_data.cc	(working copy)
@@ -144,6 +144,7 @@
                          TemplateURL* template_url,
                          const SearchTermsData& search_terms_data) {
   DCHECK(requested_origin == requested_origin.GetOrigin());
+  DCHECK(!template_url->IsExtensionKeyword());
   return requested_origin ==
       TemplateURLService::GenerateSearchURLUsingTermsData(template_url,
           search_terms_data).GetOrigin();
@@ -264,6 +265,8 @@
     return;
   }
 
+  DCHECK(!template_url->IsExtensionKeyword());
+
   IOThreadSearchTermsData search_terms_data(google_base_url_);
   const GURL url(TemplateURLService::GenerateSearchURLUsingTermsData(
       template_url, search_terms_data));