Move GPU blacklist and driver bug workaround list from json to data struct.

content/browser/gpu/gpu_data_manager_impl.h

 // Copyright (c) 2013 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 <stddef.h>
 #include <stdint.h>
 
 #include <memory>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/singleton.h"
 #include "base/process/kill.h"
 #include "base/synchronization/lock.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "content/public/browser/gpu_data_manager.h"
 #include "content/public/common/three_d_api_types.h"
+#include "gpu/config/gpu_control_list.h"
 #include "gpu/config/gpu_feature_info.h"
 #include "gpu/config/gpu_info.h"
 
 class GURL;
 
 namespace base {
 class CommandLine;
 }
 
 namespace gpu {
@@ skipping 24 matching lines @@
   enum DomainBlockStatus {
     DOMAIN_BLOCK_STATUS_BLOCKED,
     DOMAIN_BLOCK_STATUS_ALL_DOMAINS_BLOCKED,
     DOMAIN_BLOCK_STATUS_NOT_BLOCKED
   };
 
   // Getter for the singleton. This will return NULL on failure.
   static GpuDataManagerImpl* GetInstance();
 
   // GpuDataManager implementation.
-  void InitializeForTesting(const std::string& gpu_blacklist_json,
-                            const gpu::GPUInfo& gpu_info) override;
+  void BlacklistWebGLForTesting() override;
   bool IsFeatureBlacklisted(int feature) const override;
   bool IsFeatureEnabled(int feature) const override;
   bool IsWebGLEnabled() const override;
   gpu::GPUInfo GetGPUInfo() const override;
   void GetGpuProcessHandles(
       const GetGpuProcessHandlesCallback& callback) const override;
   bool GpuAccessAllowed(std::string* reason) const override;
   void RequestCompleteGpuInfoIfNeeded() override;
   bool IsEssentialGpuInfoAvailable() const override;
   bool IsCompleteGpuInfoAvailable() const override;
@@ skipping 17 matching lines @@
   bool HardwareAccelerationEnabled() const override;
   bool CanUseGpuBrowserCompositor() const override;
   void GetDisabledExtensions(std::string* disabled_extensions) const override;
   void SetGpuInfo(const gpu::GPUInfo& gpu_info) override;
 
   // This collects preliminary GPU info, load GpuBlacklist, and compute the
   // preliminary blacklisted features; it should only be called at browser
   // startup time in UI thread before the IO restriction is turned on.
   void Initialize();
 
+  void InitializeForTesting(const gpu::GpuControlListData& gpu_blacklist_data,
+                            const gpu::GPUInfo& gpu_info);
+
   // Only update if the current GPUInfo is not finalized.  If blacklist is
   // loaded, run through blacklist and update blacklisted features.
   void UpdateGpuInfo(const gpu::GPUInfo& gpu_info);
 
   // Update the GPU feature info. This updates the blacklist and enabled status
   // of GPU rasterization. In the future this will be used for more features.
   void UpdateGpuFeatureInfo(const gpu::GpuFeatureInfo& gpu_feature_info);
 
   void UpdateVideoMemoryUsageStats(
       const gpu::VideoMemoryUsageStats& video_memory_usage_stats);
@@ skipping 108 matching lines @@
 
   mutable base::Lock lock_;
   std::unique_ptr<GpuDataManagerImplPrivate> private_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuDataManagerImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GPU_GPU_DATA_MANAGER_IMPL_H_