Revert of Update SplitString calls to new form

gpu/config/gpu_test_expectations_parser.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 "gpu/config/gpu_test_expectations_parser.h"
 
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
@@ skipping 169 matching lines @@
             sizeof(kErrorMessage) / sizeof(kErrorMessage[0]));
 }
 
 GPUTestExpectationsParser::~GPUTestExpectationsParser() {
 }
 
 bool GPUTestExpectationsParser::LoadTestExpectations(const std::string& data) {
   entries_.clear();
   error_messages_.clear();
 
-  std::vector<std::string> lines = base::SplitString(
-      data, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  std::vector<std::string> lines;
+  base::SplitString(data, '\n', &lines);
   bool rt = true;
   for (size_t i = 0; i < lines.size(); ++i) {
     if (!ParseLine(lines[i], i + 1))
       rt = false;
   }
   if (DetectConflictsBetweenEntries()) {
     entries_.clear();
     rt = false;
   }
 
@@ skipping 25 matching lines @@
 }
 
 const std::vector<std::string>&
 GPUTestExpectationsParser::GetErrorMessages() const {
   return error_messages_;
 }
 
 bool GPUTestExpectationsParser::ParseConfig(
     const std::string& config_data, GPUTestConfig* config) {
   DCHECK(config);
-  std::vector<std::string> tokens = base::SplitString(
-      config_data, base::kWhitespaceASCII, base::KEEP_WHITESPACE,
-      base::SPLIT_WANT_NONEMPTY);
+  std::vector<std::string> tokens;
+  base::SplitStringAlongWhitespace(config_data, &tokens);
 
   for (size_t i = 0; i < tokens.size(); ++i) {
     Token token = ParseToken(tokens[i]);
     switch (token) {
       case kConfigWinXP:
       case kConfigWinVista:
       case kConfigWin7:
       case kConfigWin8:
       case kConfigWin10:
       case kConfigWin:
@@ skipping 28 matching lines @@
         break;
       default:
         return false;
     }
   }
   return true;
 }
 
 bool GPUTestExpectationsParser::ParseLine(
     const std::string& line_data, size_t line_number) {
-  std::vector<std::string> tokens = base::SplitString(
-      line_data, base::kWhitespaceASCII, base::KEEP_WHITESPACE,
-      base::SPLIT_WANT_NONEMPTY);
+  std::vector<std::string> tokens;
+  base::SplitStringAlongWhitespace(line_data, &tokens);
   int32 stage = kLineParserBegin;
   GPUTestExpectationEntry entry;
   entry.line_number = line_number;
   GPUTestConfig& config = entry.test_config;
   bool comments_encountered = false;
   for (size_t i = 0; i < tokens.size() && !comments_encountered; ++i) {
     Token token = ParseToken(tokens[i]);
     switch (token) {
       case kTokenComment:
         comments_encountered = true;
@@ skipping 239 matching lines @@
                          message.c_str()));
 }
 
 GPUTestExpectationsParser:: GPUTestExpectationEntry::GPUTestExpectationEntry()
     : test_expectation(0),
       line_number(0) {
 }
 
 }  // namespace gpu