Add a "disabled" field for GPU Blacklist entries.

content/browser/gpu/gpu_blacklist_unittest.cc

 // Copyright (c) 2011 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 <vector>
 
 #include "base/base_paths.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 126 matching lines @@
   // Invalid json input should not change the current blacklist settings.
   const std::string invalid_json = "invalid";
 
   EXPECT_FALSE(blacklist.LoadGpuBlacklist(invalid_json, GpuBlacklist::kAllOs));
   flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
   EXPECT_EQ(
       flags.flags(),
       static_cast<uint32>(GpuFeatureFlags::kGpuFeatureAcceleratedCompositing));
   std::vector<uint32> entries;
+  bool disabled = false;
   blacklist.GetGpuFeatureFlagEntries(
-      GpuFeatureFlags::kGpuFeatureAcceleratedCompositing, entries);
+      GpuFeatureFlags::kGpuFeatureAcceleratedCompositing, entries, disabled);
   EXPECT_EQ(entries.size(), 1u);
   EXPECT_EQ(entries[0], 5u);
   blacklist.GetGpuFeatureFlagEntries(
-      GpuFeatureFlags::kGpuFeatureAll, entries);
+      GpuFeatureFlags::kGpuFeatureAll, entries, disabled);
   EXPECT_EQ(entries.size(), 1u);
   EXPECT_EQ(entries[0], 5u);
   EXPECT_EQ(blacklist.max_entry_id(), 5u);
 }
 
 TEST_F(GpuBlacklistTest, VendorOnAllOsEntry) {
   // Blacklist a vendor on all OS.
   const std::string vendor_json =
       "{\n"
       "  \"name\": \"gpu blacklist\",\n"
@@ skipping 555 matching lines @@
 
   GpuBlacklist blacklist("1.0 unknown");
   EXPECT_TRUE(
       blacklist.LoadGpuBlacklist(gl_renderer_json, GpuBlacklist::kAllOs));
   GpuFeatureFlags flags = blacklist.DetermineGpuFeatureFlags(
       GpuBlacklist::kOsWin, os_version.get(), gpu_info());
   EXPECT_EQ(flags.flags(),
             static_cast<uint32>(GpuFeatureFlags::kGpuFeatureWebgl));
 }
 
+TEST_F(GpuBlacklistTest, DisabledEntry) {
+  const std::string disabled_json =
+      "{\n"
+      "  \"name\": \"gpu blacklist\",\n"
+      "  \"version\": \"0.1\",\n"
+      "  \"entries\": [\n"
+      "    {\n"
+      "      \"id\": 1,\n"
+      "      \"disabled\": true,\n"
+      "      \"blacklist\": [\n"
+      "        \"webgl\"\n"
+      "      ]\n"
+      "    }\n"
+      "  ]\n"
+      "}";
+  scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+
+  GpuBlacklist blacklist("1.0 unknown");
+  EXPECT_TRUE(
+      blacklist.LoadGpuBlacklist(disabled_json, GpuBlacklist::kAllOs));
+  GpuFeatureFlags flags = blacklist.DetermineGpuFeatureFlags(
+      GpuBlacklist::kOsWin, os_version.get(), gpu_info());
+  EXPECT_EQ(flags.flags(), 0u);
+  std::vector<uint32> flag_entries;
+  bool disabled = false;
+  blacklist.GetGpuFeatureFlagEntries(
+      GpuFeatureFlags::kGpuFeatureAll, flag_entries, disabled);
+  EXPECT_EQ(flag_entries.size(), 0u);
+  disabled = true;
+  blacklist.GetGpuFeatureFlagEntries(
+      GpuFeatureFlags::kGpuFeatureAll, flag_entries, disabled);
+  EXPECT_EQ(flag_entries.size(), 1u);
+}
+