Revert of Update SplitString calls to new form

google_apis/drive/test_util.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 "google_apis/drive/test_util.h"
 
 #include "base/files/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/json/json_reader.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 115 matching lines @@
                              int64* end_position,
                              int64* length) {
   DCHECK(start_position);
   DCHECK(end_position);
   DCHECK(length);
 
   std::string remaining;
   if (!RemovePrefix(value, "bytes ", &remaining))
     return false;
 
-  std::vector<base::StringPiece> parts = base::SplitStringPiece(
-      remaining, "/", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  std::vector<std::string> parts;
+  base::SplitString(remaining, '/', &parts);
   if (parts.size() != 2U)
     return false;
 
+  const std::string range = parts[0];
   if (!base::StringToInt64(parts[1], length))
     return false;
 
-  parts = base::SplitStringPiece(parts[0], "-", base::TRIM_WHITESPACE,
-                                 base::SPLIT_WANT_ALL);
+  parts.clear();
+  base::SplitString(range, '-', &parts);
   if (parts.size() != 2U)
     return false;
 
   return (base::StringToInt64(parts[0], start_position) &&
           base::StringToInt64(parts[1], end_position));
 }
 
 void AppendProgressCallbackResult(std::vector<ProgressInfo>* progress_values,
                                   int64 progress,
                                   int64 total) {
@@ skipping 16 matching lines @@
   return result;
 }
 
 void TestGetContentCallback::OnGetContent(google_apis::DriveApiErrorCode error,
                                           scoped_ptr<std::string> data) {
   data_.push_back(data.release());
 }
 
 }  // namespace test_util
 }  // namespace google_apis