Merge gpu_switching_list into gpu_driver_bug_list.

gpu/config/gpu_util.h

Index: gpu/config/gpu_util.h
diff --git a/gpu/config/gpu_util.h b/gpu/config/gpu_util.h
index 6d6800e39231e67e050c3d117111743771a5ea49..58e2db02d133e7d88402f4e74d78ab58c4798b1f 100644
--- a/gpu/config/gpu_util.h
+++ b/gpu/config/gpu_util.h
@@ -9,21 +9,12 @@
 #include <string>
 
 #include "build/build_config.h"
-#include "gpu/config/gpu_switching_option.h"
 #include "gpu/gpu_export.h"
 
 class CommandLine;
 
 namespace gpu {
 
-// Maps string to GpuSwitchingOption; returns GPU_SWITCHING_UNKNOWN if an
-// unknown name is input (case-sensitive).
-GPU_EXPORT GpuSwitchingOption StringToGpuSwitchingOption(
-    const std::string& switching_string);
-
-// Gets a string version of a GpuSwitchingOption.
-GPU_EXPORT std::string GpuSwitchingOptionToString(GpuSwitchingOption option);
-
 // Merge features in src into dst.
 GPU_EXPORT void MergeFeatureSets(
     std::set<int>* dst, const std::set<int>& src);
@@ -32,6 +23,10 @@ GPU_EXPORT void MergeFeatureSets(
 // system, and append the |command_line|.
 GPU_EXPORT void ApplyGpuDriverBugWorkarounds(CommandLine* command_line);
 
+// |str| is in the format of "feature1,feature2,...,featureN".
+GPU_EXPORT void StringToFeatureSet(
+    const std::string& str, std::set<int>* feature_set);
+
 }  // namespace gpu
 
 #endif  // GPU_CONFIG_GPU_UTIL_H_