Revert of Update SplitString calls to new form

media/filters/video_cadence_estimator_unittest.cc

 // Copyright 2015 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 "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
 #include "media/filters/video_cadence_estimator.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace media {
 
 // See VideoCadenceEstimator header for more details.
 const int kMinimumAcceptableTimeBetweenGlitchesSecs = 8;
 
 // Slows down the given |fps| according to NTSC field reduction standards; see
 // http://en.wikipedia.org/wiki/Frame_rate#Digital_video_and_television
 static double NTSC(double fps) {
   return fps / 1.001;
 }
 
 static base::TimeDelta Interval(double hertz) {
   return base::TimeDelta::FromSecondsD(1.0 / hertz);
 }
 
 std::vector<int> CreateCadenceFromString(const std::string& cadence) {
+  std::vector<std::string> tokens;
   CHECK_EQ('[', cadence[0]);
   CHECK_EQ(']', cadence[cadence.length() - 1]);
+  base::SplitString(cadence.substr(1, cadence.length() - 2), ':', &tokens);
 
   std::vector<int> result;
-  for (const std::string& token :
-       base::SplitString(cadence.substr(1, cadence.length() - 2),
-                         ":", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL)) {
+  for (const auto& token : tokens) {
     int cadence_value = 0;
     CHECK(base::StringToInt(token, &cadence_value)) << token;
     result.push_back(cadence_value);
   }
 
   return result;
 }
 
 static void VerifyCadenceVector(VideoCadenceEstimator* estimator,
                                 double frame_hertz,
@@ skipping 150 matching lines @@
   const base::TimeDelta render_interval =
       base::TimeDelta::FromMicroseconds(16715);
   const base::TimeDelta frame_duration =
       base::TimeDelta::FromMicroseconds(33360);
 
   EXPECT_TRUE(estimator.UpdateCadenceEstimate(render_interval, frame_duration,
                                               frame_duration / 2));
 }
 
 }  // namespace media