1 files changed, 7 insertions, 13 deletions
diff --git a/base/test/launcher/test_launcher.cc b/base/test/launcher/test_launcher.cc
index 4cf2d1d..29ebca7 100644
--- a/base/test/launcher/test_launcher.cc
+++ b/base/test/launcher/test_launcher.cc
@@ -561,9 +561,8 @@ void TestLauncher::OnTestFinished(const TestResult& result) {
                  << ": " << print_test_stdio;
   }
   if (print_snippet) {
-    std::vector<std::string> snippet_lines = SplitString(
-        result.output_snippet, "\n", base::KEEP_WHITESPACE,
-        base::SPLIT_WANT_ALL);
+    std::vector<std::string> snippet_lines;
+    SplitStringDontTrim(result.output_snippet, '\n', &snippet_lines);
     if (snippet_lines.size() > kOutputSnippetLinesLimit) {
       size_t truncated_size = snippet_lines.size() - kOutputSnippetLinesLimit;
       snippet_lines.erase(
@@ -792,8 +791,8 @@ bool TestLauncher::Init() {
       return false;
     }
 
-    std::vector<std::string> filter_lines = SplitString(
-        filter, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+    std::vector<std::string> filter_lines;
+    SplitString(filter, '\n', &filter_lines);
     for (size_t i = 0; i < filter_lines.size(); i++) {
       if (filter_lines[i].empty())
         continue;
@@ -809,18 +808,13 @@ bool TestLauncher::Init() {
     std::string filter = command_line->GetSwitchValueASCII(kGTestFilterFlag);
     size_t dash_pos = filter.find('-');
     if (dash_pos == std::string::npos) {
-      positive_test_filter_ = SplitString(
-          filter, ":", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+      SplitString(filter, ':', &positive_test_filter_);
     } else {
       // Everything up to the dash.
-      positive_test_filter_ = SplitString(
-          filter.substr(0, dash_pos), ":", base::TRIM_WHITESPACE,
-          base::SPLIT_WANT_ALL);
+      SplitString(filter.substr(0, dash_pos), ':', &positive_test_filter_);
 
       // Everything after the dash.
-      negative_test_filter_ = SplitString(
-          filter.substr(dash_pos + 1), ":", base::TRIM_WHITESPACE,
-          base::SPLIT_WANT_ALL);
+      SplitString(filter.substr(dash_pos + 1), ':', &negative_test_filter_);
     }
   }