Drop |languages| from {Format,Elide}Url* and IDNToUnicode

components/search_engines/template_url.cc

 // Copyright 2014 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 "components/search_engines/template_url.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 1163 matching lines @@
       "{google:instantExtendedEnabledKey}") {
     data_.search_terms_replacement_key = google_util::kInstantExtendedAPIParam;
   }
 }
 
 TemplateURL::~TemplateURL() {
 }
 
 // static
 base::string16 TemplateURL::GenerateKeyword(
-    const GURL& url,
-    const std::string& accept_languages) {
+    const GURL& url) {

[Peter Kasting, 2016/04/05 02:42:33]

Nit: Rewrap

[jungshik at Google, 2016/04/05 18:56:19]

Done.

   DCHECK(url.is_valid());
   // Strip "www." off the front of the keyword; otherwise the keyword won't work
   // properly.  See http://code.google.com/p/chromium/issues/detail?id=6984 .
   // |url|'s hostname may be IDN-encoded. Before generating |keyword| from it,
-  // convert to Unicode using the user's accept-languages, so it won't look like
-  // a confusing punycode string.
+  // convert to Unicode, so it won't look like a confusing punycode string.
   base::string16 keyword = url_formatter::StripWWW(
-      url_formatter::IDNToUnicode(url.host(), accept_languages));
+      url_formatter::IDNToUnicode(url.host()));
   // Special case: if the host was exactly "www." (not sure this can happen but
   // perhaps with some weird intranet and custom DNS server?), ensure we at
   // least don't return the empty string.
   return keyword.empty() ? base::ASCIIToUTF16("www") : keyword;
 }
 
 // static
 GURL TemplateURL::GenerateFaviconURL(const GURL& url) {
   DCHECK(url.is_valid());
   GURL::Replacements rep;
@@ skipping 241 matching lines @@
   instant_url_ref_.prepopulated_ = prepopulated;
 }
 
 void TemplateURL::ResetKeywordIfNecessary(
     const SearchTermsData& search_terms_data,
     bool force) {
   if (IsGoogleSearchURLWithReplaceableKeyword(search_terms_data) || force) {
     DCHECK(GetType() != OMNIBOX_API_EXTENSION);
     GURL url(GenerateSearchURL(search_terms_data));
     if (url.is_valid())
-      data_.SetKeyword(
-          GenerateKeyword(url, search_terms_data.GetAcceptLanguages()));
+      data_.SetKeyword(GenerateKeyword(url));
   }
 }
 
 void TemplateURL::InvalidateCachedValues() const {
   for (const TemplateURLRef& ref : url_refs_)
     ref.InvalidateCachedValues();
   suggestions_url_ref_.InvalidateCachedValues();
   instant_url_ref_.InvalidateCachedValues();
   image_url_ref_.InvalidateCachedValues();
   new_tab_url_ref_.InvalidateCachedValues();
@@ skipping 34 matching lines @@
       // patterns. This means that given patterns
       //    [ "http://foo/#q={searchTerms}", "http://foo/?q={searchTerms}" ],
       // calling ExtractSearchTermsFromURL() on "http://foo/?q=bar#q=' would
       // return false. This is important for at least Google, where such URLs
       // are invalid.
       return !search_terms->empty();
     }
   }
   return false;
 }