Revert of Update SplitString calls to new form

media/filters/source_buffer_stream_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.
 
 #include "media/filters/source_buffer_stream.h"
 
 #include <stdint.h>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 234 matching lines @@
       }
 
       EXPECT_EQ(buffer->GetDecodeTimestamp() / frame_duration_,
                 current_position);
     }
 
     EXPECT_EQ(ending_position + 1, current_position);
   }
 
   void CheckExpectedBuffers(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;
     const SourceBufferStream::Type type = stream_->GetType();
     base::TimeDelta active_splice_timestamp = kNoTimestamp();
     for (size_t i = 0; i < timestamps.size(); i++) {
       scoped_refptr<StreamParserBuffer> buffer;
       SourceBufferStream::Status status = stream_->GetNextBuffer(&buffer);
 
       if (i > 0)
         ss << " ";
 
@@ skipping 210 matching lines @@
   // K:
   // Indicates the buffer is a keyframe. E.g., "0K 1|2K 2|4D2K 6 8".
   //
   // S(a# ... y# z#)
   // Indicates a splice frame buffer should be created with timestamp z#.  The
   // preceding timestamps a# ... y# will be treated as the fade out preroll for
   // the splice frame.  If a timestamp within the preroll ends with C the config
   // id to use for that and subsequent preroll appends is incremented by one.
   // The config id for non-splice frame appends will not be affected.
   BufferQueue StringToBufferQueue(const std::string& buffers_to_append) {
-    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);
 
     CHECK_GT(timestamps.size(), 0u);
 
     bool splice_frame = false;
     size_t splice_config_id = stream_->append_config_index_;
     BufferQueue pre_splice_buffers;
     BufferQueue buffers;
     for (size_t i = 0; i < timestamps.size(); i++) {
       bool is_keyframe = false;
       bool has_preroll = false;
@@ skipping 43 matching lines @@
       }
 
       int duration_in_ms = 0;
       size_t duration_pos = timestamps[i].find('D');
       if (duration_pos != std::string::npos) {
         CHECK(base::StringToInt(timestamps[i].substr(duration_pos + 1),
                                 &duration_in_ms));
         timestamps[i] = timestamps[i].substr(0, duration_pos);
       }
 
-      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());
 
       int pts_in_ms = 0;
       int dts_in_ms = 0;
       CHECK(base::StringToInt(buffer_timestamps[0], &pts_in_ms));
       CHECK(base::StringToInt(buffer_timestamps[1], &dts_in_ms));
@@ skipping 3721 matching lines @@
   CheckVideoConfig(new_config);
 }
 
 // TODO(vrk): Add unit tests where keyframes are unaligned between streams.
 // (crbug.com/133557)
 
 // TODO(vrk): Add unit tests with end of stream being called at interesting
 // times.
 
 }  // namespace media