Revert of Update SplitString calls to new form

gpu/config/gpu_info_collector_android.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 "gpu/config/gpu_info_collector.h"
 
 #include "base/android/build_info.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
@@ skipping 16 matching lines @@
   begin = version_string.find_first_of("0123456789", begin);
   if (begin == std::string::npos)
     return std::make_pair("", std::string::npos);
 
   size_t end = version_string.find_first_not_of("01234567890.", begin);
   std::string sub_string;
   if (end != std::string::npos)
     sub_string = version_string.substr(begin, end - begin);
   else
     sub_string = version_string.substr(begin);
-  std::vector<std::string> pieces = base::SplitString(
-      sub_string, ".", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+  std::vector<std::string> pieces;
+  base::SplitString(sub_string, '.', &pieces);
   if (pieces.size() >= 2)
     return std::make_pair(pieces[0] + "." + pieces[1], end);
   else
     return std::make_pair("", end);
 }
 
 std::string GetDriverVersionFromString(const std::string& version_string) {
   // We expect that android GL_VERSION strings will be of a form
   // similar to: "OpenGL ES 2.0 V@6.0 AU@ (CL@2946718)" where the
   // first match to [0-9][0-9.]* is the OpenGL ES version number, and
@@ skipping 231 matching lines @@
   gpu_info->gpu.device_string = gpu_info->gl_renderer;
   return kCollectInfoSuccess;
 }
 
 void MergeGPUInfo(GPUInfo* basic_gpu_info,
                   const GPUInfo& context_gpu_info) {
   MergeGPUInfoGL(basic_gpu_info, context_gpu_info);
 }
 
 }  // namespace gpu