Roll base to 5e00da80f6adb7082d1c0e88d3274cf87cc43bc5 and tonic to f7acabb8fa6c91124486a41194eac3cd…

gpu/config/gpu_info_collector.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 <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 51 matching lines @@
 // Return a version string in the format of "major.minor".
 std::string GetVersionFromString(const std::string& version_string) {
   size_t begin = version_string.find_first_of("0123456789");
   if (begin != 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, '.', &pieces);
+    std::vector<std::string> pieces = base::SplitString(
+        sub_string, ".", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
     if (pieces.size() >= 2)
       return pieces[0] + "." + pieces[1];
   }
   return std::string();
 }
 
 }  // namespace anonymous
 
 namespace gpu {
 
@@ skipping 73 matching lines @@
   basic_gpu_info->sandboxed = context_gpu_info.sandboxed;
   basic_gpu_info->direct_rendering = context_gpu_info.direct_rendering;
   basic_gpu_info->context_info_state = context_gpu_info.context_info_state;
   basic_gpu_info->initialization_time = context_gpu_info.initialization_time;
   basic_gpu_info->video_encode_accelerator_supported_profiles =
       context_gpu_info.video_encode_accelerator_supported_profiles;
 }
 
 }  // namespace gpu