Generalzie GpuBlacklist to GpuControlList.

content/browser/gpu/gpu_data_manager_impl.h

 // 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.
 
 #ifndef CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_IMPL_H_
 #define CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_IMPL_H_
 
 #include <list>
 #include <map>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "base/observer_list_threadsafe.h"
 #include "base/process_util.h"
 #include "base/synchronization/lock.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "content/browser/gpu/gpu_blacklist.h"
+#include "content/browser/gpu/gpu_driver_bug_list.h"
+#include "content/browser/gpu/gpu_switching_list.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/common/gpu_info.h"
 #include "content/public/common/gpu_memory_stats.h"
 #include "content/public/common/three_d_api_types.h"
 
 class CommandLine;
 class GURL;
 
 namespace content {
 
@@ skipping 152 matching lines @@
                            UnblockDomainOfUnknownGuiltFrom3DAPIs);
   FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplTest,
                            UnblockOtherDomainFrom3DAPIs);
   FRIEND_TEST_ALL_PREFIXES(GpuDataManagerImplTest,
                            UnblockThisDomainFrom3DAPIs);
 
   GpuDataManagerImpl();
   virtual ~GpuDataManagerImpl();
 
   void InitializeImpl(const std::string& gpu_blacklist_json,
+                      const std::string& gpu_switching_list_json,
+                      const std::string& gpu_driver_bug_list_json,
                       const GPUInfo& gpu_info);
 
   void UpdateBlacklistedFeatures(GpuFeatureType features);
 
   // This should only be called once at initialization time, when preliminary
   // gpu info is collected.
   void UpdatePreliminaryBlacklistedFeatures();
 
   // Update the GPU switching status.
   // This should only be called once at initialization time.
@@ skipping 21 matching lines @@
                           int render_view_id,
                           ThreeDAPIType requester);
 
   bool complete_gpu_info_already_requested_;
 
   GpuFeatureType blacklisted_features_;
   GpuFeatureType preliminary_blacklisted_features_;
 
   GpuSwitchingOption gpu_switching_;
 
+  int gpu_driver_bugs_;
+
   GPUInfo gpu_info_;
   mutable base::Lock gpu_info_lock_;
 
   scoped_ptr<GpuBlacklist> gpu_blacklist_;
+  scoped_ptr<GpuSwitchingList> gpu_switching_list_;
+  scoped_ptr<GpuDriverBugList> gpu_driver_bug_list_;
 
   const scoped_refptr<GpuDataManagerObserverList> observer_list_;
 
   ListValue log_messages_;
   mutable base::Lock log_messages_lock_;
 
   bool software_rendering_;
 
   base::FilePath swiftshader_path_;
 
@@ skipping 11 matching lines @@
   DomainBlockMap blocked_domains_;
   mutable std::list<base::Time> timestamps_of_gpu_resets_;
   bool domain_blocking_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuDataManagerImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_IMPL_H_