components/search_engines/keyword_table.cc - Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/search_engines/keyword_table.cc

Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebased, most Android targets locally built successfully Created 4 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« components/omnibox/browser/in_memory_url_index.cc ('K') | « components/password_manager/core/browser/password_ui_utils_unittest.cc ('k') | components/search_engines/search_terms_data.h » ('j') | components/search_engines/template_url.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/search_engines/keyword_table.cc

diff --git a/components/search_engines/keyword_table.cc b/components/search_engines/keyword_table.cc

index b7d56a1ad195fbb6a3f3de19808111e8bfdbd744..ed7d6e88049ffbc4465bc2e56571afce18938795 100644

--- a/components/search_engines/keyword_table.cc

+++ b/components/search_engines/keyword_table.cc

@@ -455,8 +455,7 @@ bool KeywordTable::MigrateKeywordsTableForVersion45(const std::string& name) {

delete_entry = true;

} else {

// Ensure autogenerated keywords are unique.

- keyword = TemplateURL::GenerateKeyword(

- url, terms_data.GetAcceptLanguages());

+ keyword = TemplateURL::GenerateKeyword(url);

while (keywords.count(keyword))

keyword.append(base::ASCIIToUTF16("_"));

sql::Statement u(db_->GetUniqueStatement(