components/search_engines/default_search_pref_migration.cc - Issue 1234973004: Update SplitString calls in components

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/default_search_pref_migration.cc

Issue 1234973004: Update SplitString calls in components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fixes Created 5 years, 5 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:

Index: components/search_engines/default_search_pref_migration.cc

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

index c9f1b61883c72c4897bf5f19f65fbee816830505..0abcd4373b873d5cd2907a096c1d124864763c73 100644

--- a/components/search_engines/default_search_pref_migration.cc

+++ b/components/search_engines/default_search_pref_migration.cc

@@ -67,8 +67,9 @@ scoped_ptr<TemplateURLData> LoadDefaultSearchProviderFromLegacyPrefs(

default_provider_data->show_in_default_list = true;

default_provider_data->search_terms_replacement_key =

prefs->GetString(prefs::kDefaultSearchProviderSearchTermsReplacementKey);

- base::SplitString(prefs->GetString(prefs::kDefaultSearchProviderEncodings),

- ';', &default_provider_data->input_encodings);

+ default_provider_data->input_encodings = base::SplitString(

+ prefs->GetString(prefs::kDefaultSearchProviderEncodings),

+ ";", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);

default_provider_data->alternate_urls.clear();

const base::ListValue* alternate_urls =