Revert of Update SplitString calls to new form

media/formats/mp4/avc_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 <string.h>
 
 #include "base/basictypes.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "media/base/decrypt_config.h"
@@ skipping 127 matching lines @@
   std::vector<std::string> subsample_specs = base::SplitString(
       str, " ", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
   EXPECT_GT(subsample_specs.size(), 0u);
 
   buffer->clear();
   for (size_t i = 0; i < subsample_specs.size(); ++i) {
     SubsampleEntry entry;
     size_t start = buffer->size();
 
     std::vector<std::string> subsample_nalus = base::SplitString(
-        subsample_specs[i], ",", base::KEEP_WHITESPACE,
-        base::SPLIT_WANT_NONEMPTY);
+      subsample_specs[i], ",", base::KEEP_WHITESPACE,
+      base::SPLIT_WANT_NONEMPTY);
     EXPECT_GT(subsample_nalus.size(), 0u);
     for (size_t j = 0; j < subsample_nalus.size(); ++j) {
       WriteStartCodeAndNALUType(buffer, subsample_nalus[j]);
 
       // Write junk for the payload since the current code doesn't
       // actually look at it.
       buffer->push_back(0x32);
       buffer->push_back(0x12);
       buffer->push_back(0x67);
     }
@@ skipping 250 matching lines @@
         << "'" << test_cases[i].input << "' insert failed.";
     EXPECT_TRUE(AVC::IsValidAnnexB(buf, subsamples))
         << "'" << test_cases[i].input << "' created invalid AnnexB.";
     EXPECT_EQ(test_cases[i].expected, AnnexBToString(buf, subsamples))
         << "'" << test_cases[i].input << "' generated unexpected output.";
   }
 }
 
 }  // namespace mp4
 }  // namespace media