chrome/browser/search_engines/default_search_pref_migration.cc - Issue 1135163002: Omnibox - Strip Extra Whitespace from Custom Search Engine Names

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: chrome/browser/search_engines/default_search_pref_migration.cc

Issue 1135163002: Omnibox - Strip Extra Whitespace from Custom Search Engine Names (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix more tests that don't set short_name Created 5 years, 7 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

« no previous file with comments | « chrome/browser/search/search_unittest.cc ('k') | chrome/browser/search_engines/default_search_pref_migration_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/search_engines/default_search_pref_migration.cc

diff --git a/chrome/browser/search_engines/default_search_pref_migration.cc b/chrome/browser/search_engines/default_search_pref_migration.cc

index bc81a5bd2e53d269960ac60dc5bb8b637bde8e12..b854d0f17928ca7b3e633b7a15b144f5633540eb 100644

--- a/chrome/browser/search_engines/default_search_pref_migration.cc

+++ b/chrome/browser/search_engines/default_search_pref_migration.cc

@@ -42,8 +42,8 @@ scoped_ptr<TemplateURLData> LoadDefaultSearchProviderFromLegacyPrefs(

return scoped_ptr<TemplateURLData>();

scoped_ptr<TemplateURLData> default_provider_data(new TemplateURLData);

- default_provider_data->short_name =

- base::UTF8ToUTF16(prefs->GetString(prefs::kDefaultSearchProviderName));

+ default_provider_data->SetShortName(

+ base::UTF8ToUTF16(prefs->GetString(prefs::kDefaultSearchProviderName)));

default_provider_data->SetKeyword(keyword);

default_provider_data->SetURL(search_url);

default_provider_data->suggestions_url =