Remove remaining legacy SplitString calls.

mojo/runner/context.cc

 // Copyright 2013 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 "mojo/runner/context.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 115 matching lines @@
   // 'parameters' key on the intent, which we specify during 'am shell start'
   // via --esa, however that expects comma-separated values and says:
   //   am shell --help:
   //     [--esa <EXTRA_KEY> <EXTRA_STRING_VALUE>[,<EXTRA_STRING_VALUE...]]
   //     (to embed a comma into a string escape it using "\,")
   // Whatever takes 'parameters' and constructs a CommandLine is failing to
   // un-escape the commas, we need to move this fix to that file.
   base::ReplaceSubstringsAfterOffset(&handlers_spec, 0, "\\,", ",");
 #endif
 
-  std::vector<std::string> parts;
-  base::SplitString(handlers_spec, ',', &parts);
+  std::vector<std::string> parts = base::SplitString(
+      handlers_spec, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   if (parts.size() % 2 != 0) {
     LOG(ERROR) << "Invalid value for switch " << switches::kContentHandlers
                << ": must be a comma-separated list of mimetype/url pairs."
                << handlers_spec;
     return;
   }
 
   for (size_t i = 0; i < parts.size(); i += 2) {
     GURL url(parts[i + 1]);
     if (!url.is_valid()) {
       LOG(ERROR) << "Invalid value for switch " << switches::kContentHandlers
                  << ": '" << parts[i + 1] << "' is not a valid URL.";
       return;
     }
     // TODO(eseidel): We should also validate that the mimetype is valid
     // net/base/mime_util.h could do this, but we don't want to depend on net.
     manager->RegisterContentHandler(parts[i], url);
   }
 }
 
 void InitNativeOptions(shell::ApplicationManager* manager,
                        const base::CommandLine& command_line) {
-  std::vector<std::string> force_in_process_url_list;
-  base::SplitString(command_line.GetSwitchValueASCII(switches::kForceInProcess),
-                    ',', &force_in_process_url_list);
+  std::vector<std::string> force_in_process_url_list = base::SplitString(
+      command_line.GetSwitchValueASCII(switches::kForceInProcess), ",",
+      base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   for (const auto& force_in_process_url : force_in_process_url_list) {
     GURL gurl(force_in_process_url);
     if (!gurl.is_valid()) {
       LOG(ERROR) << "Invalid value for switch " << switches::kForceInProcess
                  << ": '" << force_in_process_url << "'is not a valid URL.";
       return;
     }
 
     shell::NativeRunnerFactory::Options options;
     options.force_in_process = true;
@@ skipping 218 matching lines @@
         base::MessageLoop::current()->Quit();
       } else {
         app_complete_callback_.Run();
       }
     }
   }
 }
 
 }  // namespace runner
 }  // namespace mojo