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

gpu/config/gpu_util.cc

 // 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.
 
 #include "gpu/config/gpu_util.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/debug/crash_logging.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 #include "gpu/config/gpu_blacklist.h"
-#include "gpu/config/gpu_control_list_jsons.h"
 #include "gpu/config/gpu_crash_keys.h"
 #include "gpu/config/gpu_driver_bug_list.h"
+#include "gpu/config/gpu_driver_bug_workaround_type.h"
 #include "gpu/config/gpu_feature_type.h"
 #include "gpu/config/gpu_finch_features.h"
 #include "gpu/config/gpu_info_collector.h"
 #include "gpu/config/gpu_switches.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/gl/gpu_switching_manager.h"
 
 namespace gpu {
 
 namespace {
@@ skipping 58 matching lines @@
     return kGpuFeatureStatusDisabled;
 
   return kGpuFeatureStatusEnabled;
 }
 
 }  // namespace anonymous
 
 void ApplyGpuDriverBugWorkarounds(const GPUInfo& gpu_info,
                                   base::CommandLine* command_line) {
   std::unique_ptr<GpuDriverBugList> list(GpuDriverBugList::Create());
-  list->LoadList(kGpuDriverBugListJson,
-                 GpuControlList::kCurrentOsOnly);
   std::set<int> workarounds = list->MakeDecision(
       GpuControlList::kOsAny, std::string(), gpu_info);
   GpuDriverBugList::AppendWorkaroundsFromCommandLine(
       &workarounds, *command_line);
   if (!workarounds.empty()) {
     command_line->AppendSwitchASCII(switches::kGpuDriverBugWorkarounds,
                                     IntSetToString(workarounds));
   }
 
   std::vector<std::string> buglist_disabled_extensions =
@@ skipping 76 matching lines @@
   else if (driver_bug_workarounds.count(gpu::FORCE_INTEGRATED_GPU) == 1)
     ui::GpuSwitchingManager::GetInstance()->ForceUseOfIntegratedGpu();
 }
 
 GpuFeatureInfo GetGpuFeatureInfo(const GPUInfo& gpu_info,
                                  const base::CommandLine& command_line) {
   GpuFeatureInfo gpu_feature_info;
   std::set<int> blacklisted_features;
   if (!command_line.HasSwitch(switches::kIgnoreGpuBlacklist)) {
     std::unique_ptr<GpuBlacklist> list(GpuBlacklist::Create());
-    list->LoadList(kSoftwareRenderingListJson, GpuControlList::kCurrentOsOnly);
     blacklisted_features =
         list->MakeDecision(GpuControlList::kOsAny, std::string(), gpu_info);
   }
 
   // Currently only used for GPU rasterization.
   gpu_feature_info.status_values[GPU_FEATURE_TYPE_GPU_RASTERIZATION] =
       GetGpuRasterizationFeatureStatus(blacklisted_features, command_line);
 
   return gpu_feature_info;
 }
@@ skipping 15 matching lines @@
                                 gpu_info.vertex_shader_version);
 #if defined(OS_MACOSX)
   base::debug::SetCrashKeyValue(crash_keys::kGPUGLVersion, gpu_info.gl_version);
 #elif defined(OS_POSIX)
   base::debug::SetCrashKeyValue(crash_keys::kGPUVendor, gpu_info.gl_vendor);
   base::debug::SetCrashKeyValue(crash_keys::kGPURenderer, gpu_info.gl_renderer);
 #endif
 }
 
 }  // namespace gpu