Make SplitStringUsingSubstr have consistent args.

chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.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 <stddef.h>
 
 #include <memory>
 #include <utility>
 
 #include "base/json/json_writer.h"
@@ skipping 283 matching lines @@
   EXPECT_TRUE(GzipUncompress(log_part, &log_part));
   EXPECT_GT(log_part.length(), 0u);
   // Verify that meta data exists.
   EXPECT_NE(std::string::npos, log_part.find(base::StringPrintf("%s: %s",
       kTestLoggingSessionIdKey, kTestLoggingSessionIdValue)));
   // Verify that the basic info generated at logging startup exists.
   EXPECT_NE(std::string::npos, log_part.find("Chrome version:"));
   EXPECT_NE(std::string::npos, log_part.find("Cpu brand:"));
 
   // Check the multipart contents.
-  std::vector<std::string> multipart_lines;
-  base::SplitStringUsingSubstr(multipart, "\r\n", &multipart_lines);
+  std::vector<std::string> multipart_lines = base::SplitStringUsingSubstr(
+      multipart, "\r\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   ASSERT_EQ(31, static_cast<int>(multipart_lines.size()));
 
   EXPECT_STREQ(&boundary[0], multipart_lines[0].c_str());
   EXPECT_STREQ("Content-Disposition: form-data; name=\"prod\"",
                multipart_lines[1].c_str());
   EXPECT_TRUE(multipart_lines[2].empty());
   EXPECT_NE(std::string::npos, multipart_lines[3].find("Chrome"));
 
   EXPECT_STREQ(&boundary[0], multipart_lines[4].c_str());
   EXPECT_STREQ("Content-Disposition: form-data; name=\"ver\"",
@@ skipping 125 matching lines @@
   ASSERT_TRUE(StartAudioDebugRecordings(0));
   ASSERT_TRUE(StopAudioDebugRecordings());
 }
 
 IN_PROC_BROWSER_TEST_F(WebrtcLoggingPrivateApiTest,
                        TestStartTimedAudioDebugRecordings) {
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kEnableAudioDebugRecordingsFromExtension);
   ASSERT_TRUE(StartAudioDebugRecordings(1));
 }