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

gpu/config/gpu_driver_bug_list_unittest.cc

Index: gpu/config/gpu_driver_bug_list_unittest.cc
diff --git a/gpu/config/gpu_driver_bug_list_unittest.cc b/gpu/config/gpu_driver_bug_list_unittest.cc
index 03bf5a3e66ee057127f56cc4a3dab93cc241df93..5ed55ecdd4aaa208e5bfa01cfcf418432af708c8 100644
--- a/gpu/config/gpu_driver_bug_list_unittest.cc
+++ b/gpu/config/gpu_driver_bug_list_unittest.cc
@@ -2,61 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <stdint.h>
-
-#include <memory>
-
 #include "base/command_line.h"
-#include "base/logging.h"
-#include "gpu/config/gpu_control_list_jsons.h"
 #include "gpu/config/gpu_driver_bug_list.h"
 #include "gpu/config/gpu_driver_bug_workaround_type.h"
 #include "gpu/config/gpu_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#define LONG_STRING_CONST(...) #__VA_ARGS__
-
 namespace gpu {
 
 class GpuDriverBugListTest : public testing::Test {
  public:
-  GpuDriverBugListTest() { }
-
+  GpuDriverBugListTest() {}
   ~GpuDriverBugListTest() override {}
-
-  const GPUInfo& gpu_info() const {
-    return gpu_info_;
-  }
-
- protected:
-  void SetUp() override {
-    gpu_info_.gpu.vendor_id = 0x10de;
-    gpu_info_.gpu.device_id = 0x0640;
-    gpu_info_.driver_vendor = "NVIDIA";
-    gpu_info_.driver_version = "1.6.18";
-    gpu_info_.driver_date = "7-14-2009";
-    gpu_info_.machine_model_name = "MacBookPro";
-    gpu_info_.machine_model_version = "7.1";
-    gpu_info_.gl_vendor = "NVIDIA Corporation";
-    gpu_info_.gl_renderer = "NVIDIA GeForce GT 120 OpenGL Engine";
-  }
-
-  void TearDown() override {}
-
- private:
-  GPUInfo gpu_info_;
 };
 
-TEST_F(GpuDriverBugListTest, CurrentDriverBugListValidation) {
-  std::unique_ptr<GpuDriverBugList> list(GpuDriverBugList::Create());
-  std::string json;
-  EXPECT_TRUE(list->LoadList(kGpuDriverBugListJson, GpuControlList::kAllOs));
-}
-
 TEST_F(GpuDriverBugListTest, CurrentListForARM) {
-  std::unique_ptr<GpuDriverBugList> list(GpuDriverBugList::Create());
-  EXPECT_TRUE(list->LoadList(kGpuDriverBugListJson, GpuControlList::kAllOs));
-
+  std::unique_ptr<GpuDriverBugList> list = GpuDriverBugList::Create();
   GPUInfo gpu_info;
   gpu_info.gl_vendor = "ARM";
   gpu_info.gl_renderer = "MALi_T604";
@@ -66,9 +27,7 @@ TEST_F(GpuDriverBugListTest, CurrentListForARM) {
 }
 
 TEST_F(GpuDriverBugListTest, CurrentListForImagination) {
-  std::unique_ptr<GpuDriverBugList> list(GpuDriverBugList::Create());
-  EXPECT_TRUE(list->LoadList(kGpuDriverBugListJson, GpuControlList::kAllOs));
-
+  std::unique_ptr<GpuDriverBugList> list = GpuDriverBugList::Create();
   GPUInfo gpu_info;
   gpu_info.gl_vendor = "Imagination Technologies";
   gpu_info.gl_renderer = "PowerVR SGX 540";
@@ -77,55 +36,6 @@ TEST_F(GpuDriverBugListTest, CurrentListForImagination) {
   EXPECT_EQ(1u, bugs.count(USE_CLIENT_SIDE_ARRAYS_FOR_STREAM_BUFFERS));
 }
 
-TEST_F(GpuDriverBugListTest, GpuSwitching) {
-  const std::string json = LONG_STRING_CONST(
-      {
-        "name": "gpu driver bug list",
-        "version": "0.1",
-        "entries": [
-          {
-            "id": 1,
-            "os": {
-              "type": "macosx"
-            },
-            "features": [
-              "force_discrete_gpu"
-            ]
-          },
-          {
-            "id": 2,
-            "os": {
-              "type": "win"
-            },
-            "features": [
-              "force_integrated_gpu"
-            ]
-          }
-        ]
-      }
-  );
-  std::unique_ptr<GpuDriverBugList> driver_bug_list(GpuDriverBugList::Create());
-  EXPECT_TRUE(driver_bug_list->LoadList(json, GpuControlList::kAllOs));
-  std::set<int> switching = driver_bug_list->MakeDecision(
-      GpuControlList::kOsMacosx, "10.8", gpu_info());
-  EXPECT_EQ(1u, switching.size());
-  EXPECT_EQ(1u, switching.count(FORCE_DISCRETE_GPU));
-  std::vector<uint32_t> entries;
-  driver_bug_list->GetDecisionEntries(&entries, false);
-  ASSERT_EQ(1u, entries.size());
-  EXPECT_EQ(1u, entries[0]);
-
-  driver_bug_list.reset(GpuDriverBugList::Create());
-  EXPECT_TRUE(driver_bug_list->LoadList(json, GpuControlList::kAllOs));
-  switching = driver_bug_list->MakeDecision(
-      GpuControlList::kOsWin, "6.1", gpu_info());
-  EXPECT_EQ(1u, switching.size());
-  EXPECT_EQ(1u, switching.count(FORCE_INTEGRATED_GPU));
-  driver_bug_list->GetDecisionEntries(&entries, false);
-  ASSERT_EQ(1u, entries.size());
-  EXPECT_EQ(2u, entries[0]);
-}
-
 TEST_F(GpuDriverBugListTest, AppendSingleWorkaround) {
   base::CommandLine command_line(0, NULL);
   command_line.AppendSwitch(GpuDriverBugWorkaroundTypeToString(
@@ -156,62 +66,4 @@ TEST_F(GpuDriverBugListTest, AppendForceGPUWorkaround) {
   EXPECT_EQ(1u, workarounds.count(FORCE_DISCRETE_GPU));
 }
 
-TEST_F(GpuDriverBugListTest, NVIDIANumberingScheme) {
-  const std::string json = LONG_STRING_CONST(
-      {
-        "name": "gpu driver bug list",
-        "version": "0.1",
-        "entries": [
-          {
-            "id": 1,
-            "os": {
-              "type": "win"
-            },
-            "vendor_id": "0x10de",
-            "driver_version": {
-              "op": "<=",
-              "value": "8.17.12.6973"
-            },
-            "features": [
-              "disable_d3d11"
-            ]
-          }
-        ]
-      }
-  );
-
-  std::unique_ptr<GpuDriverBugList> list(GpuDriverBugList::Create());
-  EXPECT_TRUE(list->LoadList(json, GpuControlList::kAllOs));
-
-  GPUInfo gpu_info;
-  gpu_info.gl_vendor = "NVIDIA";
-  gpu_info.gl_renderer = "NVIDIA GeForce GT 120 OpenGL Engine";
-  gpu_info.gpu.vendor_id = 0x10de;
-  gpu_info.gpu.device_id = 0x0640;
-
-  // test the same driver version number
-  gpu_info.driver_version = "8.17.12.6973";
-  std::set<int> bugs = list->MakeDecision(
-      GpuControlList::kOsWin, "7.0", gpu_info);
-  EXPECT_EQ(1u, bugs.count(DISABLE_D3D11));
-
-  // test a lower driver version number
-  gpu_info.driver_version = "8.15.11.8647";
-
-  bugs = list->MakeDecision(GpuControlList::kOsWin, "7.0", gpu_info);
-  EXPECT_EQ(1u, bugs.count(DISABLE_D3D11));
-
-  // test a higher driver version number
-  gpu_info.driver_version = "9.18.13.2723";
-  bugs = list->MakeDecision(GpuControlList::kOsWin, "7.0", gpu_info);
-  EXPECT_EQ(0u, bugs.count(DISABLE_D3D11));
-}
-
-TEST_F(GpuDriverBugListTest, DuplicatedBugIDValidation) {
-  std::unique_ptr<GpuDriverBugList> list(GpuDriverBugList::Create());
-  EXPECT_TRUE(list->LoadList(kGpuDriverBugListJson, GpuControlList::kAllOs));
-  EXPECT_FALSE(list->has_duplicated_entry_id());
-}
-
 }  // namespace gpu
-