Revert of Update SplitString calls to new form

content/common/gpu/media/video_decode_accelerator_unittest.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.
 //
 // The bulk of this file is support code; sorry about that.  Here's an overview
 // to hopefully help readers of this code:
 // - RenderingHelper is charged with interacting with X11/{EGL/GLES2,GLX/GL} or
 //   Win/EGL.
 // - ClientState is an enum for the state of the decode client used by the test.
 // - ClientStateNotification is a barrier abstraction that allows the test code
@@ skipping 162 matching lines @@
 const gfx::Size kThumbnailSize(160, 120);
 const int kMD5StringLength = 32;
 
 // Read in golden MD5s for the thumbnailed rendering of this video
 void ReadGoldenThumbnailMD5s(const TestVideoFile* video_file,
                              std::vector<std::string>* md5_strings) {
   base::FilePath filepath(video_file->file_name);
   filepath = filepath.AddExtension(FILE_PATH_LITERAL(".md5"));
   std::string all_md5s;
   base::ReadFileToString(filepath, &all_md5s);
-  *md5_strings = base::SplitString(
-      all_md5s, "\n", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  base::SplitString(all_md5s, '\n', md5_strings);
   // Check these are legitimate MD5s.
-  for (const std::string& md5_string : *md5_strings) {
+  for (std::vector<std::string>::iterator md5_string = md5_strings->begin();
+      md5_string != md5_strings->end(); ++md5_string) {
       // Ignore the empty string added by SplitString
-      if (!md5_string.length())
+      if (!md5_string->length())
         continue;
       // Ignore comments
-      if (md5_string.at(0) == '#')
+      if (md5_string->at(0) == '#')
         continue;
 
-      CHECK_EQ(static_cast<int>(md5_string.length()),
-               kMD5StringLength) << md5_string;
-      bool hex_only = std::count_if(md5_string.begin(),
-                                    md5_string.end(), isxdigit) ==
+      CHECK_EQ(static_cast<int>(md5_string->length()),
+               kMD5StringLength) << *md5_string;
+      bool hex_only = std::count_if(md5_string->begin(),
+                                    md5_string->end(), isxdigit) ==
                                     kMD5StringLength;
-      CHECK(hex_only) << md5_string;
+      CHECK(hex_only) << *md5_string;
   }
   CHECK_GE(md5_strings->size(), 1U) << "  MD5 checksum file ("
                                     << filepath.MaybeAsASCII()
                                     << ") missing or empty.";
 }
 
 // State of the GLRenderingVDAClient below.  Order matters here as the test
 // makes assumptions about it.
 enum ClientState {
   CS_CREATED = 0,
@@ skipping 844 matching lines @@
       FROM_HERE, base::Bind(&RenderingHelper::UnInitialize,
                             base::Unretained(&rendering_helper_), &done));
   done.Wait();
 
   rendering_helper_.TearDown();
 }
 
 void VideoDecodeAcceleratorTest::ParseAndReadTestVideoData(
     base::FilePath::StringType data,
     std::vector<TestVideoFile*>* test_video_files) {
-  std::vector<base::FilePath::StringType> entries = base::SplitString(
-      data, base::FilePath::StringType(1, ';'),
-      base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  std::vector<base::FilePath::StringType> entries;
+  base::SplitString(data, ';', &entries);
   CHECK_GE(entries.size(), 1U) << data;
   for (size_t index = 0; index < entries.size(); ++index) {
-    std::vector<base::FilePath::StringType> fields = base::SplitString(
-        entries[index], base::FilePath::StringType(1, ':'),
-        base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+    std::vector<base::FilePath::StringType> fields;
+    base::SplitString(entries[index], ':', &fields);
     CHECK_GE(fields.size(), 1U) << entries[index];
     CHECK_LE(fields.size(), 8U) << entries[index];
     TestVideoFile* video_file = new TestVideoFile(fields[0]);
     if (!fields[1].empty())
       CHECK(base::StringToInt(fields[1], &video_file->width));
     if (!fields[2].empty())
       CHECK(base::StringToInt(fields[2], &video_file->height));
     if (!fields[3].empty())
       CHECK(base::StringToInt(fields[3], &video_file->num_frames));
     if (!fields[4].empty())
@@ skipping 560 matching lines @@
   content::VaapiWrapper::PreSandboxInitialization();
 #endif
 
   content::g_env =
       reinterpret_cast<content::VideoDecodeAcceleratorTestEnvironment*>(
           testing::AddGlobalTestEnvironment(
               new content::VideoDecodeAcceleratorTestEnvironment()));
 
   return RUN_ALL_TESTS();
 }