diff options
Diffstat (limited to 'chrome/browser/extensions/api')
5 files changed, 16 insertions, 14 deletions
diff --git a/chrome/browser/extensions/api/commands/command_service.cc b/chrome/browser/extensions/api/commands/command_service.cc index 7636c93..5ff8711 100644 --- a/chrome/browser/extensions/api/commands/command_service.cc +++ b/chrome/browser/extensions/api/commands/command_service.cc @@ -389,12 +389,12 @@ Command CommandService::FindCommandByName(const std::string& extension_id, bool global = false; item->GetBoolean(kGlobal, &global); - std::vector<std::string> tokens; - base::SplitString(shortcut, ':', &tokens); + std::vector<base::StringPiece> tokens = base::SplitStringPiece( + shortcut, ":", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); CHECK(tokens.size() >= 2); - shortcut = tokens[1]; - return Command(command_name, base::string16(), shortcut, global); + return Command(command_name, base::string16(), tokens[1].as_string(), + global); } return Command(); diff --git a/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc b/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc index 9a01de9..e6df024 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc +++ b/chrome/browser/extensions/api/file_system/file_system_api_unittest.cc @@ -61,13 +61,15 @@ AcceptOption* BuildAcceptOption(const std::string& description, option->description.reset(new std::string(description)); if (!mime_types.empty()) { - option->mime_types.reset(new std::vector<std::string>()); - base::SplitString(mime_types, ',', option->mime_types.get()); + option->mime_types.reset(new std::vector<std::string>( + base::SplitString(mime_types, ",", + base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL))); } if (!extensions.empty()) { - option->extensions.reset(new std::vector<std::string>()); - base::SplitString(extensions, ',', option->extensions.get()); + option->extensions.reset(new std::vector<std::string>( + base::SplitString(extensions, ",", + base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL))); } return option; diff --git a/chrome/browser/extensions/api/i18n/i18n_api.cc b/chrome/browser/extensions/api/i18n/i18n_api.cc index ca40229..b1b9f94 100644 --- a/chrome/browser/extensions/api/i18n/i18n_api.cc +++ b/chrome/browser/extensions/api/i18n/i18n_api.cc @@ -45,8 +45,8 @@ bool I18nGetAcceptLanguagesFunction::RunSync() { return false; } - std::vector<std::string> languages; - base::SplitString(accept_languages, ',', &languages); + std::vector<std::string> languages = base::SplitString( + accept_languages, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); languages.erase(std::remove(languages.begin(), languages.end(), ""), languages.end()); diff --git a/chrome/browser/extensions/api/identity/gaia_web_auth_flow.cc b/chrome/browser/extensions/api/identity/gaia_web_auth_flow.cc index d97fca42..825c87c 100644 --- a/chrome/browser/extensions/api/identity/gaia_web_auth_flow.cc +++ b/chrome/browser/extensions/api/identity/gaia_web_auth_flow.cc @@ -52,8 +52,8 @@ GaiaWebAuthFlow::GaiaWebAuthFlow(Delegate* delegate, std::vector<std::string> scopes(token_key->scopes.begin(), token_key->scopes.end()); - std::vector<std::string> client_id_parts; - base::SplitString(oauth2_client_id, '.', &client_id_parts); + std::vector<std::string> client_id_parts = base::SplitString( + oauth2_client_id, ".", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); std::reverse(client_id_parts.begin(), client_id_parts.end()); redirect_scheme_ = base::JoinString(client_id_parts, "."); std::string signin_scoped_device_id; diff --git a/chrome/browser/extensions/api/log_private/log_parser.cc b/chrome/browser/extensions/api/log_private/log_parser.cc index d88c73a..ef6c59e 100644 --- a/chrome/browser/extensions/api/log_private/log_parser.cc +++ b/chrome/browser/extensions/api/log_private/log_parser.cc @@ -28,9 +28,9 @@ void LogParser::Parse( const string& input, std::vector<linked_ptr<api::log_private::LogEntry> >* output, FilterHandler* filter_handler) const { - std::vector<string> entries; // Assume there is no newline in the log entry - base::SplitString(input, '\n', &entries); + std::vector<string> entries = base::SplitString( + input, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL); for (size_t i = 0; i < entries.size(); i++) { ParseEntry(entries[i], output, filter_handler); |