components/search_engines/keyword_table.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/keyword_table.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/keyword_table.cc

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

index 754c42e7818b848db4ebf55cb0591135ca740417..296410237a854352f9651b5643ec17344d56e113 100644

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

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

@@ -313,7 +313,8 @@ bool KeywordTable::GetKeywordDataFromStatement(const sql::Statement& s,

data->originating_url = GURL(s.ColumnString(6));

data->show_in_default_list = s.ColumnBool(10);

data->safe_for_autoreplace = s.ColumnBool(5);

- base::SplitString(s.ColumnString(9), ';', &data->input_encodings);

+ data->input_encodings = base::SplitString(

+ s.ColumnString(9), ";", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);

data->id = s.ColumnInt64(0);

data->date_created = Time::FromTimeT(s.ColumnInt64(7));

data->last_modified = Time::FromTimeT(s.ColumnInt64(15));