Update SplitString calls in chrome.

In many places that iterated over the results, the code was changed to use a range-based for loop over the result of the SplitStirng call.

Review URL: https://codereview.chromium.org/1240183002

Cr-Commit-Position: refs/heads/master@{#339753}

8 files changed, 30 insertions, 28 deletions

diff --git a/chrome/test/chromedriver/capabilities.cc b/chrome/test/chromedriver/capabilities.cc
index 33b34d2..bc5bbbb 100644
--- a/chrome/test/chromedriver/capabilities.cc
+++ b/chrome/test/chromedriver/capabilities.cc
@@ -294,8 +294,8 @@ Status ParseUseRemoteBrowser(const base::Value& option,
   if (!option.GetAsString(&server_addr))
     return Status(kUnknownError, "must be 'host:port'");
 
-  std::vector<std::string> values;
-  base::SplitString(server_addr, ':', &values);
+  std::vector<std::string> values = base::SplitString(
+      server_addr, ":", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   if (values.size() != 2)
     return Status(kUnknownError, "must be 'host:port'");
 
diff --git a/chrome/test/chromedriver/chrome/adb_impl.cc b/chrome/test/chromedriver/chrome/adb_impl.cc
index 46db337..b177d7d 100644
--- a/chrome/test/chromedriver/chrome/adb_impl.cc
+++ b/chrome/test/chromedriver/chrome/adb_impl.cc
@@ -14,6 +14,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_tokenizer.h"
+#include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/time/time.h"
@@ -87,8 +88,9 @@ Status AdbImpl::GetDevices(std::vector<std::string>* devices) {
     return status;
   base::StringTokenizer lines(response, "\n");
   while (lines.GetNext()) {
-    std::vector<std::string> fields;
-    base::SplitStringAlongWhitespace(lines.token(), &fields);
+    std::vector<std::string> fields = base::SplitString(
+        lines.token_piece(), base::kWhitespaceASCII,
+        base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
     if (fields.size() == 2 && fields[1] == "device") {
       devices->push_back(fields[0]);
     }
@@ -199,17 +201,14 @@ Status AdbImpl::GetPidByName(const std::string& device_serial,
   if (!status.IsOk())
     return status;
 
-  std::vector<std::string> lines;
-  base::SplitString(response, '\n', &lines);
-  for (size_t i = 0; i < lines.size(); ++i) {
-    std::string line = lines[i];
-    if (line.empty())
-      continue;
-    std::vector<std::string> tokens;
-    base::SplitStringAlongWhitespace(line, &tokens);
+  for (const base::StringPiece& line : base::SplitString(
+           response, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) {
+    std::vector<base::StringPiece> tokens = base::SplitStringPiece(
+        line, base::kWhitespaceASCII,
+        base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
     if (tokens.size() != 9)
       continue;
-    if (tokens[8].compare(process_name) == 0) {
+    if (tokens[8] == process_name) {
       if (base::StringToInt(tokens[1], pid)) {
         return Status(kOk);
       } else {
diff --git a/chrome/test/chromedriver/chrome/browser_info.cc b/chrome/test/chromedriver/chrome/browser_info.cc
index 23782f2..4f79ee3 100644
--- a/chrome/test/chromedriver/chrome/browser_info.cc
+++ b/chrome/test/chromedriver/chrome/browser_info.cc
@@ -77,8 +77,8 @@ Status ParseBrowserString(bool has_android_package,
   int build_no = 0;
   if (browser_string.find(kVersionPrefix) == 0u) {
     std::string version = browser_string.substr(kVersionPrefix.length());
-    std::vector<std::string> version_parts;
-    base::SplitString(version, '.', &version_parts);
+    std::vector<base::StringPiece> version_parts = base::SplitStringPiece(
+        version, ".", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
 
     if (version_parts.size() != 4 ||
         !base::StringToInt(version_parts[2], &build_no)) {
diff --git a/chrome/test/chromedriver/chrome/chrome_android_impl.cc b/chrome/test/chromedriver/chrome/chrome_android_impl.cc
index 5a58e665..5cfcec0 100644
--- a/chrome/test/chromedriver/chrome/chrome_android_impl.cc
+++ b/chrome/test/chromedriver/chrome/chrome_android_impl.cc
@@ -37,8 +37,9 @@ std::string ChromeAndroidImpl::GetOperatingSystemName() {
 bool ChromeAndroidImpl::HasTouchScreen() const {
   const BrowserInfo* browser_info = GetBrowserInfo();
   if (browser_info->browser_name == "webview") {
-    std::vector<std::string> version_parts;
-    base::SplitString(browser_info->browser_version, '.', &version_parts);
+    std::vector<base::StringPiece> version_parts = base::SplitStringPiece(
+        browser_info->browser_version, ".",
+        base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
     int major_version;
     if (version_parts.size() != 4 ||
         !base::StringToInt(version_parts[0], &major_version)) {
diff --git a/chrome/test/chromedriver/chrome_launcher_unittest.cc b/chrome/test/chromedriver/chrome_launcher_unittest.cc
index 5ccec7c..ec8f7a1 100644
--- a/chrome/test/chromedriver/chrome_launcher_unittest.cc
+++ b/chrome/test/chromedriver/chrome_launcher_unittest.cc
@@ -124,8 +124,9 @@ TEST(ProcessExtensions, MultipleExtensionsNoBgPages) {
   ASSERT_TRUE(switches.HasSwitch("load-extension"));
   base::CommandLine::StringType ext_paths =
       switches.GetSwitchValueNative("load-extension");
-  std::vector<base::CommandLine::StringType> ext_path_list;
-  base::SplitString(ext_paths, FILE_PATH_LITERAL(','), &ext_path_list);
+  std::vector<base::CommandLine::StringType> ext_path_list =
+      base::SplitString(ext_paths, base::CommandLine::StringType(1, ','),
+      base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   ASSERT_EQ(2u, ext_path_list.size());
   ASSERT_TRUE(base::PathExists(base::FilePath(ext_path_list[0])));
   ASSERT_TRUE(base::PathExists(base::FilePath(ext_path_list[1])));
diff --git a/chrome/test/chromedriver/element_commands.cc b/chrome/test/chromedriver/element_commands.cc
index 49df717..ebb7b97 100644
--- a/chrome/test/chromedriver/element_commands.cc
+++ b/chrome/test/chromedriver/element_commands.cc
@@ -334,11 +334,11 @@ Status ExecuteSendKeysToElement(
     }
 
     // Separate the string into separate paths, delimited by '\n'.
-    std::vector<base::FilePath::StringType> path_strings;
-    base::SplitString(paths_string, '\n', &path_strings);
     std::vector<base::FilePath> paths;
-    for (size_t i = 0; i < path_strings.size(); ++i)
-      paths.push_back(base::FilePath(path_strings[i]));
+    for (const auto& path_piece : base::SplitStringPiece(
+             paths_string, base::FilePath::StringType(1, '\n'),
+             base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL))
+      paths.push_back(base::FilePath(path_piece));
 
     bool multiple = false;
     status = IsElementAttributeEqualToIgnoreCase(
diff --git a/chrome/test/chromedriver/server/chromedriver_server.cc b/chrome/test/chromedriver/server/chromedriver_server.cc
index 499338e..f9d1954 100644
--- a/chrome/test/chromedriver/server/chromedriver_server.cc
+++ b/chrome/test/chromedriver/server/chromedriver_server.cc
@@ -287,7 +287,8 @@ int main(int argc, char *argv[]) {
   if (cmd_line->HasSwitch("whitelisted-ips")) {
     allow_remote = true;
     std::string whitelist = cmd_line->GetSwitchValueASCII("whitelisted-ips");
-    base::SplitString(whitelist, ',', &whitelisted_ips);
+    whitelisted_ips = base::SplitString(
+        whitelist, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   }
   if (!cmd_line->HasSwitch("silent")) {
     printf("Starting ChromeDriver %s on port %u\n", kChromeDriverVersion, port);
diff --git a/chrome/test/chromedriver/server/http_handler.cc b/chrome/test/chromedriver/server/http_handler.cc
index 0d54c22..63c0a95 100644
--- a/chrome/test/chromedriver/server/http_handler.cc
+++ b/chrome/test/chromedriver/server/http_handler.cc
@@ -742,10 +742,10 @@ bool MatchesCommand(const std::string& method,
   if (!MatchesMethod(command.method, method))
     return false;
 
-  std::vector<std::string> path_parts;
-  base::SplitString(path, '/', &path_parts);
-  std::vector<std::string> command_path_parts;
-  base::SplitString(command.path_pattern, '/', &command_path_parts);
+  std::vector<std::string> path_parts = base::SplitString(
+      path, "/", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  std::vector<std::string> command_path_parts = base::SplitString(
+      command.path_pattern, "/", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   if (path_parts.size() != command_path_parts.size())
     return false;