summaryrefslogtreecommitdiffstats
path: root/chromeos/dbus
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-08-12 00:31:18 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-12 07:31:56 +0000
commit83dc1610d1a0e3b78909b565943bfa12aeae9370 (patch)
tree787766c2e0a7e0345474646efdce63dff9ac5c61 /chromeos/dbus
parenta91b4915fd7038c8bbea8b02cd6a8ac5a92bae8a (diff)
downloadchromium_src-83dc1610d1a0e3b78909b565943bfa12aeae9370.zip
chromium_src-83dc1610d1a0e3b78909b565943bfa12aeae9370.tar.gz
chromium_src-83dc1610d1a0e3b78909b565943bfa12aeae9370.tar.bz2
Remove remaining legacy SplitString calls.
TBR=zelidrag@chromium.org (chromeos) Review URL: https://codereview.chromium.org/1284833004 Cr-Commit-Position: refs/heads/master@{#342983}
Diffstat (limited to 'chromeos/dbus')
-rw-r--r--chromeos/dbus/dbus_client_bundle.cc13
1 files changed, 5 insertions, 8 deletions
diff --git a/chromeos/dbus/dbus_client_bundle.cc b/chromeos/dbus/dbus_client_bundle.cc
index 89ac436..20b0898 100644
--- a/chromeos/dbus/dbus_client_bundle.cc
+++ b/chromeos/dbus/dbus_client_bundle.cc
@@ -354,17 +354,14 @@ void DBusClientBundle::SetupDefaultEnvironment() {
DBusClientBundle::DBusClientTypeMask DBusClientBundle::ParseUnstubList(
const std::string& unstub_list) {
DBusClientTypeMask unstub_mask = 0;
- std::vector<std::string> unstub_components;
- base::SplitString(unstub_list, ',', &unstub_components);
- for (std::vector<std::string>::const_iterator iter =
- unstub_components.begin();
- iter != unstub_components.end(); ++iter) {
- DBusClientBundle::DBusClientType client = GetDBusClientType(*iter);
+ for (const std::string& cur : base::SplitString(
+ unstub_list, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
+ DBusClientBundle::DBusClientType client = GetDBusClientType(cur);
if (client != NO_CLIENT) {
- LOG(WARNING) << "Unstubbing dbus client for " << *iter;
+ LOG(WARNING) << "Unstubbing dbus client for " << cur;
unstub_mask |= client;
} else {
- LOG(ERROR) << "Unknown dbus client: " << *iter;
+ LOG(ERROR) << "Unknown dbus client: " << cur;
}
}