summaryrefslogtreecommitdiffstats
path: root/chromeos/network
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/network
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/network')
-rw-r--r--chromeos/network/network_change_notifier_chromeos_unittest.cc15
1 files changed, 9 insertions, 6 deletions
diff --git a/chromeos/network/network_change_notifier_chromeos_unittest.cc b/chromeos/network/network_change_notifier_chromeos_unittest.cc
index ffbe7c7..570bc36 100644
--- a/chromeos/network/network_change_notifier_chromeos_unittest.cc
+++ b/chromeos/network/network_change_notifier_chromeos_unittest.cc
@@ -127,8 +127,9 @@ class NetworkChangeNotifierChromeosUpdateTest : public testing::Test {
notifier_.service_path_ = notifier_state.service_path;
notifier_.ip_address_ = notifier_state.ip_address;
notifier_.max_bandwidth_mbps_ = notifier_state.max_bandwidth;
- std::vector<std::string> dns_servers;
- base::SplitString(notifier_state.dns_servers, ',', &dns_servers);
+ std::vector<std::string> dns_servers =
+ base::SplitString(notifier_state.dns_servers, ",",
+ base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
notifier_.dns_servers_ = dns_servers;
}
@@ -137,8 +138,9 @@ class NetworkChangeNotifierChromeosUpdateTest : public testing::Test {
EXPECT_EQ(notifier_state.service_path, notifier_.service_path_);
EXPECT_EQ(notifier_state.ip_address, notifier_.ip_address_);
EXPECT_EQ(notifier_state.max_bandwidth, notifier_.max_bandwidth_mbps_);
- std::vector<std::string> dns_servers;
- base::SplitString(notifier_state.dns_servers, ',', &dns_servers);
+ std::vector<std::string> dns_servers =
+ base::SplitString(notifier_state.dns_servers, ",",
+ base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
EXPECT_EQ(dns_servers, notifier_.dns_servers_);
}
@@ -155,8 +157,9 @@ class NetworkChangeNotifierChromeosUpdateTest : public testing::Test {
default_network_state.network_technology;
default_network_.path_ = default_network_state.service_path;
default_network_.ip_address_ = default_network_state.ip_address;
- std::vector<std::string> dns_servers;
- base::SplitString(default_network_state.dns_servers, ',', &dns_servers);
+ std::vector<std::string> dns_servers =
+ base::SplitString(default_network_state.dns_servers, ",",
+ base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
default_network_.dns_servers_ = dns_servers;
}