Roll base to 5e00da80f6adb7082d1c0e88d3274cf87cc43bc5 and tonic to f7acabb8fa6c91124486a41194eac3cd…

gpu/command_buffer/service/feature_info.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/command_buffer/service/feature_info.h"
 
 #include <set>
 
 #include "base/command_line.h"
 #include "base/macros.h"
@@ skipping 55 matching lines @@
 
  private:
   std::set<std::string> string_set_;
 };
 
 // Process a string of wordaround type IDs (seperated by ',') and set up
 // the corresponding Workaround flags.
 void StringToWorkarounds(
     const std::string& types, FeatureInfo::Workarounds* workarounds) {
   DCHECK(workarounds);
-  std::vector<std::string> pieces;
-  base::SplitString(types, ',', &pieces);
+  std::vector<std::string> pieces = base::SplitString(
+      types, ",", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
   for (size_t i = 0; i < pieces.size(); ++i) {
     int number = 0;
     bool succeed = base::StringToInt(pieces[i], &number);
     DCHECK(succeed);
     switch (number) {
 #define GPU_OP(type, name)    \
   case gpu::type:             \
     workarounds->name = true; \
     break;
       GPU_DRIVER_BUG_WORKAROUNDS(GPU_OP)
@@ skipping 1065 matching lines @@
   if (pos == std::string::npos) {
     extensions_ += (extensions_.empty() ? "" : " ") + str;
   }
 }
 
 FeatureInfo::~FeatureInfo() {
 }
 
 }  // namespace gles2
 }  // namespace gpu