Unpunycode search keywords and short names.

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_fetcher_factory.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
+#include "components/search_engines/search_terms_data.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_fetcher.h"
 #include "components/search_engines/template_url_service.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/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "content/public/common/url_fetcher.h"
 
 using content::NavigationController;
 using content::NavigationEntry;
 using content::WebContents;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(SearchEngineTabHelper);
 
 namespace {
 
 // Returns true if the entry's transition type is FORM_SUBMIT.
 bool IsFormSubmit(const NavigationEntry* entry) {
   return (ui::PageTransitionStripQualifier(entry->GetTransitionType()) ==
           ui::PAGE_TRANSITION_FORM_SUBMIT);
 }
 
 base::string16 GenerateKeywordFromNavigationEntry(
-    const NavigationEntry* entry) {
+    const NavigationEntry* entry,
+    const std::string& accept_languages) {
   // Don't autogenerate keywords for pages that are the result of form
   // submissions.
   if (IsFormSubmit(entry))
     return base::string16();
 
   // 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 base::string16();
   }
 
   // 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(url::kHttpScheme) || (url.path().length() > 1))
     return base::string16();
 
-  return TemplateURL::GenerateKeyword(url);
+  return TemplateURL::GenerateKeyword(url, accept_languages);
 }
 
 void AssociateURLFetcherWithWebContents(content::WebContents* web_contents,
                                         net::URLFetcher* url_fetcher) {
   content::AssociateURLFetcherWithRenderFrame(
       url_fetcher,
       web_contents->GetURL(),
       web_contents->GetRenderProcessHost()->GetID(),
       web_contents->GetMainFrame()->GetRoutingID());
 }
@@ skipping 61 matching lines @@
        (index > 0) && IsFormSubmit(entry);
        entry = controller.GetEntryAtIndex(index))
     --index;
   if (!entry || IsFormSubmit(entry))
     return;
 
   // Autogenerate a keyword for the autodetected case; in the other cases we'll
   // generate a keyword later after fetching the OSDD.
   base::string16 keyword;
   if (provider_type == TemplateURLFetcher::AUTODETECTED_PROVIDER) {
-    keyword = GenerateKeywordFromNavigationEntry(entry);
+    std::string accept_languages;
+    if (TemplateURLService* url_service =
+            TemplateURLServiceFactory::GetForProfile(profile)) {

[Peter Kasting, 2015/07/20 19:30:51]

Don't put a statement with side effects in a conditional.

In this case, if you have the profile anyway, get the accept-languages from its
prefs directly; don't go through the TemplateURLService.

[alshabalin, 2015/07/21 08:44:19]

Done.

Although I somewhat disagree. In my brain accept_languages for
TemplateURL::GenerateKeyword
is not an input bun an environment. And (again, in my mind) environment for
TemplateURL should
lie with TemplateURLService.

+      accept_languages =
+          url_service->search_terms_data().GetAcceptedLanguages();
+    }
+    keyword = GenerateKeywordFromNavigationEntry(entry, accept_languages);
     if (keyword.empty())
       return;
   }
 
   // Download the OpenSearch description document. If this is successful, a
   // new keyword will be created when done.
   TemplateURLFetcherFactory::GetForProfile(profile)->ScheduleDownload(
       keyword, osdd_url, entry->GetFavicon().url,
       base::Bind(&AssociateURLFetcherWithWebContents, web_contents()),
       base::Bind(&SearchEngineTabHelper::OnDownloadedOSDD,
@@ skipping 20 matching lines @@
 
   const NavigationController& controller = web_contents()->GetController();
   int last_index = controller.GetLastCommittedEntryIndex();
   // When there was no previous page, the last index will be 0. This is
   // normally due to a form submit that opened in a new tab.
   // TODO(brettw) bug 916126: we should support keywords when form submits
   //              happen in new tabs.
   if (last_index <= 0)
     return;
 
-  base::string16 keyword(GenerateKeywordFromNavigationEntry(
-      controller.GetEntryAtIndex(last_index - 1)));
-  if (keyword.empty())
-    return;
-
   TemplateURLService* url_service =
       TemplateURLServiceFactory::GetForProfile(profile);
   if (!url_service)
     return;
 
+  base::string16 keyword(GenerateKeywordFromNavigationEntry(
+      controller.GetEntryAtIndex(last_index - 1),
+      url_service->search_terms_data().GetAcceptedLanguages()));

[Peter Kasting, 2015/07/20 19:30:51]

Again, get the languages off the profile prefs directly here.

+  if (keyword.empty())
+    return;
+
   if (!url_service->loaded()) {
     url_service->Load();
     return;
   }
 
   TemplateURL* current_url;
   GURL url = params.searchable_form_url;
   if (!url_service->CanAddAutogeneratedKeyword(keyword, url, &current_url))
     return;
 
@@ skipping 17 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(data));
 }