Revert of Update SplitString calls to new form

media/filters/frame_processor_unittest.cc

Index: media/filters/frame_processor_unittest.cc
diff --git a/media/filters/frame_processor_unittest.cc b/media/filters/frame_processor_unittest.cc
index 3a7f01cd848fffa49c50c9dd4c6761a0adc393a5..e0bd663b91ccfa9c8d0814c2e79665830f5465c5 100644
--- a/media/filters/frame_processor_unittest.cc
+++ b/media/filters/frame_processor_unittest.cc
@@ -99,8 +99,8 @@
   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++) {
@@ -112,8 +112,8 @@
       }
 
       // 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());
@@ -193,8 +193,8 @@
   // 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;