Merge gpu_switching_list into gpu_driver_bug_list.

content/browser/gpu/gpu_data_manager_impl_private.h

Index: content/browser/gpu/gpu_data_manager_impl_private.h
diff --git a/content/browser/gpu/gpu_data_manager_impl_private.h b/content/browser/gpu/gpu_data_manager_impl_private.h
index ed1b39cd90686e2e2d0bb01bbcf5bb716902f43a..056920bfdba4c92ab8e4a3973afcf090922c8b50 100644
--- a/content/browser/gpu/gpu_data_manager_impl_private.h
+++ b/content/browser/gpu/gpu_data_manager_impl_private.h
@@ -16,7 +16,6 @@
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "gpu/config/gpu_blacklist.h"
 #include "gpu/config/gpu_driver_bug_list.h"
-#include "gpu/config/gpu_switching_list.h"
 
 namespace content {
 
@@ -65,8 +64,6 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
 
   void UpdateRendererWebPrefs(WebPreferences* prefs) const;
 
-  gpu::GpuSwitchingOption GetGpuSwitchingOption() const;
-
   std::string GetBlacklistVersion() const;
   std::string GetDriverBugListVersion() const;
 
@@ -169,7 +166,6 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
   explicit GpuDataManagerImplPrivate(GpuDataManagerImpl* owner);
 
   void InitializeImpl(const std::string& gpu_blacklist_json,
-                      const std::string& gpu_switching_list_json,
                       const std::string& gpu_driver_bug_list_json,
                       const gpu::GPUInfo& gpu_info);
 
@@ -206,14 +202,11 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
   std::set<int> blacklisted_features_;
   std::set<int> preliminary_blacklisted_features_;
 
-  gpu::GpuSwitchingOption gpu_switching_;
-
   std::set<int> gpu_driver_bugs_;
 
   gpu::GPUInfo gpu_info_;
 
   scoped_ptr<gpu::GpuBlacklist> gpu_blacklist_;
-  scoped_ptr<gpu::GpuSwitchingList> gpu_switching_list_;
   scoped_ptr<gpu::GpuDriverBugList> gpu_driver_bug_list_;
 
   const scoped_refptr<GpuDataManagerObserverList> observer_list_;