Replace some Tokenize calls with SplitString.

chrome/browser/devtools/device/adb/mock_adb_server.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/devtools/device/adb/mock_adb_server.h"
 
 #include "base/location.h"
 #include "base/memory/weak_ptr.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
+#include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/non_thread_safe.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/browser_test.h"
 #include "content/public/test/test_utils.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
@@ skipping 470 matching lines @@
 MockAndroidConnection::~MockAndroidConnection() {
 }
 
 void MockAndroidConnection::Receive(const std::string& data) {
   request_ += data;
   size_t request_end_pos = data.find(kHttpRequestTerminator);
   if (request_end_pos == std::string::npos)
     return;
 
   std::string request(request_.substr(0, request_end_pos));
-  std::vector<std::string> tokens;
-  Tokenize(request, " ", &tokens);
+  std::vector<std::string> tokens =
+      base::SplitString(request, " ", base::KEEP_WHITESPACE,
+                        base::SPLIT_WANT_NONEMPTY);
   CHECK_EQ(3U, tokens.size());
   CHECK_EQ("GET", tokens[0]);
   CHECK_EQ("HTTP/1.1", tokens[2]);
 
   std::string path(tokens[1]);
   if (path == kJsonPath)
     path = kJsonListPath;
 
   if (socket_name_ == "chrome_devtools_remote") {
     if (path == kJsonVersionPath)
@@ skipping 27 matching lines @@
     NOTREACHED() << "Unknown socket " << socket_name_;
   }
 }
 
 void MockAndroidConnection::ProcessCommand(const std::string& command) {
   if (command.find(kLocalAbstractPrefix) == 0) {
     socket_name_ = command.substr(strlen(kLocalAbstractPrefix));
     delegate_->SendSuccess(std::string());
   } else {
     if (command.find(kShellPrefix) == 0) {
-      std::vector<std::string> lines;
-      Tokenize(command.substr(strlen(kShellPrefix)), "\n", &lines);
       std::string result;
-      for (const auto& line : lines) {
+      for (const auto& line :
+           base::SplitString(command.substr(strlen(kShellPrefix)), "\n",
+                             base::KEEP_WHITESPACE,
+                             base::SPLIT_WANT_NONEMPTY)) {
         if (line == kDeviceModelCommand) {
           result += kDeviceModel;
           result += "\r\n";
         } else if (line == kOpenedUnixSocketsCommand) {
           result += kSampleOpenedUnixSockets;
         } else if (line == kDumpsysCommand) {
           result += kSampleDumpsys;
         } else if (line == kListProcessesCommand) {
           result += kSampleListProcesses;
         } else if (line == kListUsersCommand) {
@@ skipping 31 matching lines @@
 
 void StopMockAdbServer() {
   BrowserThread::PostTaskAndReply(
       BrowserThread::IO,
       FROM_HERE,
       base::Bind(&StopMockAdbServerOnIOThread),
       base::MessageLoop::QuitClosure());
   content::RunMessageLoop();
 }