Revert of Update SplitString calls to new form

media/renderers/video_renderer_impl_unittest.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 <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/debug/stack_trace.h"
@@ skipping 148 matching lines @@
   //
   // Syntax:
   //   nn - Queue a decoder buffer with timestamp nn * 1000us
   //   abort - Queue an aborted read
   //   error - Queue a decoder error
   //
   // Examples:
   //   A clip that is four frames long: "0 10 20 30"
   //   A clip that has a decode error: "60 70 error"
   void QueueFrames(const std::string& str) {
-    for (const std::string& token :
-         base::SplitString(str, " ", base::TRIM_WHITESPACE,
-                           base::SPLIT_WANT_ALL)) {
-      if (token == "abort") {
+    std::vector<std::string> tokens;
+    base::SplitString(str, ' ', &tokens);
+    for (size_t i = 0; i < tokens.size(); ++i) {
+      if (tokens[i] == "abort") {
         scoped_refptr<VideoFrame> null_frame;
         decode_results_.push_back(
             std::make_pair(VideoDecoder::kAborted, null_frame));
         continue;
       }
 
-      if (token == "error") {
+      if (tokens[i] == "error") {
         scoped_refptr<VideoFrame> null_frame;
         decode_results_.push_back(
             std::make_pair(VideoDecoder::kDecodeError, null_frame));
         continue;
       }
 
       int timestamp_in_ms = 0;
-      if (base::StringToInt(token, &timestamp_in_ms)) {
+      if (base::StringToInt(tokens[i], &timestamp_in_ms)) {
         gfx::Size natural_size = TestVideoConfig::NormalCodedSize();
         scoped_refptr<VideoFrame> frame = VideoFrame::CreateFrame(
             PIXEL_FORMAT_YV12, natural_size, gfx::Rect(natural_size),
             natural_size, base::TimeDelta::FromMilliseconds(timestamp_in_ms));
         decode_results_.push_back(std::make_pair(VideoDecoder::kOk, frame));
         continue;
       }
 
-      CHECK(false) << "Unrecognized decoder buffer token: " << token;
+      CHECK(false) << "Unrecognized decoder buffer token: " << tokens[i];
     }
   }
 
   bool IsReadPending() {
     return !decode_cb_.is_null();
   }
 
   void WaitForError(PipelineStatus expected) {
     SCOPED_TRACE(base::StringPrintf("WaitForError(%d)", expected));
     error_event_.RunAndWaitForStatus(expected);
@@ skipping 541 matching lines @@
 }
 
 INSTANTIATE_TEST_CASE_P(OldVideoRenderer,
                         VideoRendererImplTest,
                         testing::Values(false));
 INSTANTIATE_TEST_CASE_P(NewVideoRenderer,
                         VideoRendererImplTest,
                         testing::Values(true));
 
 }  // namespace media