Generalzie GpuBlacklist to GpuControlList.

content/browser/gpu/gpu_data_manager_impl_unittest.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 "base/message_loop.h"
 #include "base/run_loop.h"
 #include "base/time.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/public/browser/gpu_data_manager_observer.h"
 #include "content/public/common/gpu_info.h"
@@ skipping 99 matching lines @@
   EXPECT_EQ(0, manager->GetBlacklistedFeatures());
   EXPECT_TRUE(manager->GpuAccessAllowed());
 
   const std::string blacklist_json =
       "{\n"
       "  \"name\": \"gpu blacklist\",\n"
       "  \"version\": \"0.1\",\n"
       "  \"entries\": [\n"
       "    {\n"
       "      \"id\": 1,\n"
-      "      \"blacklist\": [\n"
+      "      \"features\": [\n"
       "        \"webgl\"\n"
       "      ]\n"
       "    },\n"
       "    {\n"
       "      \"id\": 2,\n"
       "      \"gl_renderer\": {\n"
       "        \"op\": \"contains\",\n"
       "        \"value\": \"GeForce\"\n"
       "      },\n"
-      "      \"blacklist\": [\n"
+      "      \"features\": [\n"
       "        \"accelerated_2d_canvas\"\n"
       "      ]\n"
       "    }\n"
       "  ]\n"
       "}";
 
   GPUInfo gpu_info;
   gpu_info.gpu.vendor_id = 0x10de;
   gpu_info.gpu.device_id = 0x0640;
   manager->InitializeForTesting(blacklist_json, gpu_info);
@@ skipping 24 matching lines @@
       "    {\n"
       "      \"id\": 1,\n"
       "      \"exceptions\": [\n"
       "        {\n"
       "          \"gl_renderer\": {\n"
       "            \"op\": \"contains\",\n"
       "            \"value\": \"GeForce\"\n"
       "          }\n"
       "        }\n"
       "      ],\n"
-      "      \"blacklist\": [\n"
+      "      \"features\": [\n"
       "        \"webgl\"\n"
       "      ]\n"
       "    }\n"
       "  ]\n"
       "}";
 
   GPUInfo gpu_info;
   gpu_info.gpu.vendor_id = 0x10de;
   gpu_info.gpu.device_id = 0x0640;
   manager->InitializeForTesting(blacklist_json, gpu_info);
@@ skipping 286 matching lines @@
       "      \"vendor_id\": \"0x8086\",\n"
       "      \"exceptions\": [\n"
       "        {\n"
       "          \"device_id\": [\"0x0042\"],\n"
       "          \"driver_version\": {\n"
       "            \"op\": \">=\",\n"
       "            \"number\": \"8.0.2\"\n"
       "          }\n"
       "        }\n"
       "      ],\n"
-      "      \"blacklist\": [\n"
+      "      \"features\": [\n"
       "        \"webgl\"\n"
       "      ]\n"
       "    }\n"
       "  ]\n"
       "}";
 
   GPUInfo gpu_info;
   gpu_info.gpu.vendor_id = 0x8086;
   gpu_info.gpu.device_id = 0x0042;
   manager->InitializeForTesting(blacklist_json, gpu_info);
@@ skipping 32 matching lines @@
       "      \"vendor_id\": \"0x8086\",\n"
       "      \"exceptions\": [\n"
       "        {\n"
       "          \"device_id\": [\"0x0042\"],\n"
       "          \"driver_version\": {\n"
       "            \"op\": \">=\",\n"
       "            \"number\": \"8.0.2\"\n"
       "          }\n"
       "        }\n"
       "      ],\n"
-      "      \"blacklist\": [\n"
+      "      \"features\": [\n"
       "        \"webgl\"\n"
       "      ]\n"
       "    }\n"
       "  ]\n"
       "}";
 
   GPUInfo gpu_info;
   gpu_info.gpu.vendor_id = 0x8086;
   gpu_info.gpu.device_id = 0x0042;
   gpu_info.gl_vendor = kGLVendorMesa;
@@ skipping 10 matching lines @@
   // Now assume browser gets GL strings from local state.
   // SetGLStrings() has no effects because GPUInfo already got these strings.
   // (Otherwise the entry should not apply.)
   manager->SetGLStrings(kGLVendorMesa, kGLRendererMesa, kGLVersionMesa802);
   EXPECT_TRUE(manager->GpuAccessAllowed());
   EXPECT_EQ(GPU_FEATURE_TYPE_WEBGL, manager->GetBlacklistedFeatures());
 }
 #endif  // OS_LINUX
 
 }  // namespace content