Make SplitStringUsingSubstr have consistent args.

chrome/browser/devtools/device/android_device_info_query.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 <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
@@ skipping 265 matching lines @@
 }
 
 void ReceivedResponse(const AndroidDeviceManager::DeviceInfoCallback& callback,
                       int result,
                       const std::string& response) {
   AndroidDeviceManager::DeviceInfo device_info;
   if (result < 0) {
     callback.Run(device_info);
     return;
   }
-  std::vector<std::string> outputs;
-  base::SplitStringUsingSubstr(response, kSeparator, &outputs);
+  std::vector<std::string> outputs = base::SplitStringUsingSubstr(
+      response, kSeparator, base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   if (outputs.size() != 5) {
     callback.Run(device_info);
     return;
   }
   device_info.connected = true;
   device_info.model = outputs[0];
   device_info.screen_size = ParseWindowPolicyResponse(outputs[1]);
   StringMap pid_to_package;
   StringMap pid_to_user;
   MapProcessesToPackages(outputs[2], &pid_to_package, &pid_to_user);
@@ skipping 63 matching lines @@
 }
 
 // static
 void AndroidDeviceManager::QueryDeviceInfo(
     const RunCommandCallback& command_callback,
     const DeviceInfoCallback& callback) {
   command_callback.Run(
       kAllCommands,
       base::Bind(&ReceivedResponse, callback));
 }