Remove the "autogenerate keyword" bit on TemplateURL.

chrome/browser/ui/search_engines/search_engine_tab_helper.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/ui/search_engines/search_engine_tab_helper.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_fetcher.h"
 #include "chrome/browser/search_engines/template_url_fetcher_factory.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/search_engines/template_url_fetcher_ui_callbacks.h"
 #include "chrome/common/render_messages.h"
+#include "chrome/common/url_constants.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/frame_navigate_params.h"
 
 using content::NavigationController;
 using content::NavigationEntry;
 using content::WebContents;
 
@@ skipping 13 matching lines @@
 
   // We want to use the user typed URL if available since that represents what
   // the user typed to get here, and fall back on the regular URL if not.
   GURL url = entry->GetUserTypedURL();
   if (!url.is_valid()) {
     url = entry->GetURL();
     if (!url.is_valid())
       return string16();
   }
 
-  return TemplateURLService::GenerateKeyword(url, true);
+  // Don't autogenerate keywords for referrers that are anything other than HTTP
+  // or have a path.
+  //
+  // If we relax the path constraint, we need to be sure to sanitize the path
+  // elements and update AutocompletePopup to look for keywords using the path.
+  // See http://b/issue?id=863583.
+  if (!url.SchemeIs(chrome::kHttpScheme) || (url.path().length() > 1))
+    return string16();
+
+  return TemplateURLService::GenerateKeyword(url);
 }
 
 }  // namespace
 
 SearchEngineTabHelper::SearchEngineTabHelper(WebContents* web_contents)
     : content::WebContentsObserver(web_contents) {
   DCHECK(web_contents);
 }
 
 SearchEngineTabHelper::~SearchEngineTabHelper() {
@@ skipping 123 matching lines @@
   // the favicon url wasn't obtained before the load started. This assumes the
   // latter.
   // TODO(sky): Need a way to set the favicon that doesn't involve generating
   // its url.
   data.favicon_url = current_favicon.is_valid() ?
       current_favicon : TemplateURL::GenerateFaviconURL(params.referrer.url);
   data.safe_for_autoreplace = true;
   data.input_encodings.push_back(params.searchable_form_encoding);
   url_service->Add(new TemplateURL(profile, data));
 }