| 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 502861832a6cac795da3a413b58b658f6f230146..bccff1667b6650e2c9384fb432c9917bd0ee4fe3 100644
|
| --- a/content/browser/gpu/gpu_data_manager_impl_private.h
|
| +++ b/content/browser/gpu/gpu_data_manager_impl_private.h
|
| @@ -39,9 +39,8 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
|
| public:
|
| static GpuDataManagerImplPrivate* Create(GpuDataManagerImpl* owner);
|
|
|
| - void InitializeForTesting(
|
| - const std::string& gpu_blacklist_json,
|
| - const gpu::GPUInfo& gpu_info);
|
| + void InitializeForTesting(const gpu::GpuControlListData& gpu_blacklist_data,
|
| + const gpu::GPUInfo& gpu_info);
|
| bool IsFeatureBlacklisted(int feature) const;
|
| bool IsFeatureEnabled(int feature) const;
|
| bool IsWebGLEnabled() const;
|
| @@ -193,8 +192,8 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
|
|
|
| explicit GpuDataManagerImplPrivate(GpuDataManagerImpl* owner);
|
|
|
| - void InitializeImpl(const std::string& gpu_blacklist_json,
|
| - const std::string& gpu_driver_bug_list_json,
|
| + void InitializeImpl(const gpu::GpuControlListData& gpu_blacklist_data,
|
| + const gpu::GpuControlListData& gpu_driver_bug_list_data,
|
| const gpu::GPUInfo& gpu_info);
|
|
|
| void RunPostInitTasks();
|
|
|