Merge gpu_switching_list into gpu_driver_bug_list.

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/strings/string_number_conversions.h"
-#include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/command_buffer/service/gpu_switches.h"
+#include "gpu/config/gpu_util.h"
 #include "ui/gl/gl_implementation.h"
 
 #if defined(OS_MACOSX)
 #include "ui/gl/io_surface_support_mac.h"
 #endif
 
 namespace gpu {
 namespace gles2 {
 
 namespace {
@@ skipping 37 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);
-  for (size_t i = 0; i < pieces.size(); ++i) {
-    int number = 0;
-    bool succeed = base::StringToInt(pieces[i], &number);
-    DCHECK(succeed);
-    switch (number) {
+  std::set<int> int_set;
+  gpu::StringToFeatureSet(types, &int_set);
+  for (std::set<int>::const_iterator it = int_set.begin();
+       it != int_set.end(); ++it) {
+    switch (*it) {
 #define GPU_OP(type, name)    \
   case gpu::type:             \
     workarounds->name = true; \
     break;
       GPU_DRIVER_BUG_WORKAROUNDS(GPU_OP)
 #undef GPU_OP
       default:
         NOTIMPLEMENTED();
     }
   }
@@ skipping 617 matching lines @@
   if (extensions_.find(str) == std::string::npos) {
     extensions_ += (extensions_.empty() ? "" : " ") + str;
   }
 }
 
 FeatureInfo::~FeatureInfo() {
 }
 
 }  // namespace gles2
 }  // namespace gpu