Revert of Update SplitString calls to new form

media/filters/frame_processor_unittest.cc

 // Copyright 2014 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 <map>
 #include <string>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 81 matching lines @@
   }
 
   void SetTimestampOffset(base::TimeDelta new_offset) {
     timestamp_offset_ = new_offset;
     frame_processor_->SetGroupStartTimestampIfInSequenceMode(timestamp_offset_);
   }
 
   BufferQueue StringToBufferQueue(const std::string& buffers_to_append,
                                   const TrackId track_id,
                                   const DemuxerStream::Type type) {
-    std::vector<std::string> timestamps = base::SplitString(
-        buffers_to_append, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+    std::vector<std::string> timestamps;
+    base::SplitString(buffers_to_append, ' ', &timestamps);
 
     BufferQueue buffers;
     for (size_t i = 0; i < timestamps.size(); i++) {
       bool is_keyframe = false;
       if (base::EndsWith(timestamps[i], "K", base::CompareCase::SENSITIVE)) {
         is_keyframe = true;
         // Remove the "K" off of the token.
         timestamps[i] = timestamps[i].substr(0, timestamps[i].length() - 1);
       }
 
       // Use custom decode timestamp if included.
-      std::vector<std::string> buffer_timestamps = base::SplitString(
-          timestamps[i], "|", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+      std::vector<std::string> buffer_timestamps;
+      base::SplitString(timestamps[i], '|', &buffer_timestamps);
       if (buffer_timestamps.size() == 1)
         buffer_timestamps.push_back(buffer_timestamps[0]);
       CHECK_EQ(2u, buffer_timestamps.size());
 
       double time_in_ms, decode_time_in_ms;
       CHECK(base::StringToDouble(buffer_timestamps[0], &time_in_ms));
       CHECK(base::StringToDouble(buffer_timestamps[1], &decode_time_in_ms));
 
       // Create buffer. Encode the original time_in_ms as the buffer's data to
       // enable later verification of possible buffer relocation in presentation
@@ skipping 59 matching lines @@
         << "2 kAborted reads in a row. Giving up.";
     EXPECT_FALSE(read_callback_called_);
   }
 
   // Format of |expected| is a space-delimited sequence of
   // timestamp_in_ms:original_timestamp_in_ms
   // original_timestamp_in_ms (and the colon) must be omitted if it is the same
   // as timestamp_in_ms.
   void CheckReadsThenReadStalls(ChunkDemuxerStream* stream,
                                 const std::string& expected) {
-    std::vector<std::string> timestamps = base::SplitString(
-        expected, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+    std::vector<std::string> timestamps;
+    base::SplitString(expected, ' ', &timestamps);
     std::stringstream ss;
     for (size_t i = 0; i < timestamps.size(); ++i) {
       int loop_count = 0;
 
       do {
         read_callback_called_ = false;
         stream->Read(base::Bind(&FrameProcessorTest::StoreStatusAndBuffer,
                                 base::Unretained(this)));
         message_loop_.RunUntilIdle();
         EXPECT_TRUE(read_callback_called_);
@@ skipping 528 matching lines @@
   CheckExpectedRangesByTimestamp(audio_.get(), "{ [0,5) }");
   CheckExpectedRangesByTimestamp(video_.get(), "{ [0,20) }");
   CheckReadsThenReadStalls(audio_.get(), "0:-5");
   CheckReadsThenReadStalls(video_.get(), "0 10");
 }
 
 INSTANTIATE_TEST_CASE_P(SequenceMode, FrameProcessorTest, Values(true));
 INSTANTIATE_TEST_CASE_P(SegmentsMode, FrameProcessorTest, Values(false));
 
 }  // namespace media