Update SplitString calls in components

components/nacl/browser/nacl_process_host.cc

 // Copyright (c) 2012 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 "components/nacl/browser/nacl_process_host.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 91 matching lines @@
       *out_addr = addr;
       *out_size = info.RegionSize;
     }
     addr += info.RegionSize;
   }
 }
 
 #ifdef _DLL
 
 bool IsInPath(const std::string& path_env_var, const std::string& dir) {
-  std::vector<std::string> split;
-  base::SplitString(path_env_var, ';', &split);
-  for (std::vector<std::string>::const_iterator i(split.begin());
-       i != split.end();
-       ++i) {
-    if (*i == dir)
+  for (const base::StringPiece& cur : base::SplitStringPiece(
+           path_env_var, ";", base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL)) {
+    if (cur == dir)
       return true;
   }
   return false;
 }
 
 #endif  // _DLL
 
 }  // namespace
 
 // Allocates |size| bytes of address space in the given process at a
@@ skipping 423 matching lines @@
 void NaClProcessHost::LaunchNaClGdb() {
   const base::CommandLine& command_line =
       *base::CommandLine::ForCurrentProcess();
 #if defined(OS_WIN)
   base::FilePath nacl_gdb =
       command_line.GetSwitchValuePath(switches::kNaClGdb);
   base::CommandLine cmd_line(nacl_gdb);
 #else
   base::CommandLine::StringType nacl_gdb =
       command_line.GetSwitchValueNative(switches::kNaClGdb);
-  base::CommandLine::StringVector argv;
   // We don't support spaces inside arguments in --nacl-gdb switch.
-  base::SplitString(nacl_gdb, static_cast<base::CommandLine::CharType>(' '),
-                    &argv);
-  base::CommandLine cmd_line(argv);
+  base::CommandLine cmd_line(base::SplitString(
+      nacl_gdb, base::CommandLine::StringType(1, ' '),
+      base::KEEP_WHITESPACE, base::SPLIT_WANT_ALL));
 #endif
   cmd_line.AppendArg("--eval-command");
   base::FilePath::StringType irt_path(
       NaClBrowser::GetInstance()->GetIrtFilePath().value());
   // Avoid back slashes because nacl-gdb uses posix escaping rules on Windows.
   // See issue https://code.google.com/p/nativeclient/issues/detail?id=3482.
   std::replace(irt_path.begin(), irt_path.end(), '\\', '/');
   cmd_line.AppendArgNative(FILE_PATH_LITERAL("nacl-irt \"") + irt_path +
                            FILE_PATH_LITERAL("\""));
   if (!manifest_path_.empty()) {
@@ skipping 813 matching lines @@
     NaClStartDebugExceptionHandlerThread(
         process.Pass(), info, base::ThreadTaskRunnerHandle::Get(),
         base::Bind(&NaClProcessHost::OnDebugExceptionHandlerLaunchedByBroker,
                    weak_factory_.GetWeakPtr()));
     return true;
   }
 }
 #endif
 
 }  // namespace nacl