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

gpu/config/gpu_control_list.cc

Index: gpu/config/gpu_control_list.cc
diff --git a/gpu/config/gpu_control_list.cc b/gpu/config/gpu_control_list.cc
index a7850406f2559c07bd2c60cbcedbad6d25a3f786..334ea2a1390c7b67b20b9bbd14f0340facc2919f 100644
--- a/gpu/config/gpu_control_list.cc
+++ b/gpu/config/gpu_control_list.cc
@@ -4,13 +4,6 @@
 
 #include "gpu/config/gpu_control_list.h"
 
-#include <stddef.h>
-#include <stdint.h>
-
-#include <utility>
-
-#include "base/cpu.h"
-#include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
@@ -18,7 +11,6 @@
 #include "base/strings/stringprintf.h"
 #include "base/sys_info.h"
 #include "gpu/config/gpu_info.h"
-#include "gpu/config/gpu_util.h"
 #include "third_party/re2/src/re2/re2.h"
 
 namespace gpu {
@@ -104,93 +96,53 @@ bool StringMismatch(const std::string& input, const std::string& pattern) {
   return !RE2::FullMatch(input, pattern);
 }
 
-const char kMultiGpuStyleStringAMDSwitchable[] = "amd_switchable";
-const char kMultiGpuStyleStringAMDSwitchableDiscrete[] =
-    "amd_switchable_discrete";
-const char kMultiGpuStyleStringAMDSwitchableIntegrated[] =
-    "amd_switchable_integrated";
-const char kMultiGpuStyleStringOptimus[] = "optimus";
-
-const char kMultiGpuCategoryStringPrimary[] = "primary";
-const char kMultiGpuCategoryStringSecondary[] = "secondary";
-const char kMultiGpuCategoryStringActive[] = "active";
-const char kMultiGpuCategoryStringAny[] = "any";
-
-const char kGLTypeStringGL[] = "gl";
-const char kGLTypeStringGLES[] = "gles";
-const char kGLTypeStringANGLE[] = "angle";
-
-const char kVersionStyleStringNumerical[] = "numerical";
-const char kVersionStyleStringLexical[] = "lexical";
-
-const char kOp[] = "op";
-
-}  // namespace
-
-GpuControlList::VersionInfo::VersionInfo(
-    const std::string& version_op,
-    const std::string& version_style,
-    const std::string& version_string,
-    const std::string& version_string2)
-    : version_style_(kVersionStyleNumerical) {
-  op_ = StringToNumericOp(version_op);
-  if (op_ == kUnknown || op_ == kAny)
-    return;
-  version_style_ = StringToVersionStyle(version_style);
-  if (!ProcessVersionString(version_string, '.', &version_)) {
-    op_ = kUnknown;
-    return;
-  }
-  if (op_ == kBetween) {
-    if (!ProcessVersionString(version_string2, '.', &version2_))
-      op_ = kUnknown;
-  }
-}
-
-GpuControlList::VersionInfo::~VersionInfo() {
+bool StringMismatch(const std::string& input, const char* pattern) {
+  if (!pattern)
+    return false;
+  std::string pattern_string(pattern);
+  return StringMismatch(input, pattern_string);
 }
 
-bool GpuControlList::VersionInfo::Contains(
-    const std::string& version_string) const {
-  return Contains(version_string, '.');
-}
+}  // namespace
 
-bool GpuControlList::VersionInfo::Contains(
-    const std::string& version_string, char splitter) const {
-  if (op_ == kUnknown)
+bool GpuControlList::Version::Contains(const std::string& version_string,
+                                       char splitter) const {
+  if (op == kUnknown)
     return false;
-  if (op_ == kAny)
+  if (op == kAny)
     return true;
   std::vector<std::string> version;
   if (!ProcessVersionString(version_string, splitter, &version))
     return false;
-  int relation = Compare(version, version_, version_style_);
-  if (op_ == kEQ)
-    return (relation == 0);
-  else if (op_ == kLT)
-    return (relation < 0);
-  else if (op_ == kLE)
-    return (relation <= 0);
-  else if (op_ == kGT)
-    return (relation > 0);
-  else if (op_ == kGE)
-    return (relation >= 0);
-  // op_ == kBetween
+  std::vector<std::string> ref_version;
+  bool valid = ProcessVersionString(value1, '.', &ref_version);
+  DCHECK(valid);
+  int relation = Version::Compare(version, ref_version, style);
+  switch (op) {
+    case kEQ:
+      return (relation == 0);
+    case kLT:
+      return (relation < 0);
+    case kLE:
+      return (relation <= 0);
+    case kGT:
+      return (relation > 0);
+    case kGE:
+      return (relation >= 0);
+    default:
+      break;
+  }
+  DCHECK_EQ(kBetween, op);
   if (relation < 0)
     return false;
-  return Compare(version, version2_, version_style_) <= 0;
-}
-
-bool GpuControlList::VersionInfo::IsValid() const {
-  return (op_ != kUnknown && version_style_ != kVersionStyleUnknown);
-}
-
-bool GpuControlList::VersionInfo::IsLexical() const {
-  return version_style_ == kVersionStyleLexical;
+  ref_version.clear();
+  valid = ProcessVersionString(value2, '.', &ref_version);
+  DCHECK(valid);
+  return Compare(version, ref_version, style) <= 0;
 }
 
 // static
-int GpuControlList::VersionInfo::Compare(
+int GpuControlList::Version::Compare(
     const std::vector<std::string>& version,
     const std::vector<std::string>& version_ref,
     VersionStyle version_style) {
@@ -211,976 +163,47 @@ int GpuControlList::VersionInfo::Compare(
   return 0;
 }
 
-// static
-GpuControlList::VersionInfo::VersionStyle
-GpuControlList::VersionInfo::StringToVersionStyle(
-    const std::string& version_style) {
-  if (version_style.empty() || version_style == kVersionStyleStringNumerical)
-    return kVersionStyleNumerical;
-  if (version_style == kVersionStyleStringLexical)
-    return kVersionStyleLexical;
-  return kVersionStyleUnknown;
-}
-
-GpuControlList::OsInfo::OsInfo(const std::string& os,
-                             const std::string& version_op,
-                             const std::string& version_string,
-                             const std::string& version_string2) {
-  type_ = StringToOsType(os);
-  if (type_ != kOsUnknown) {
-    version_info_.reset(new VersionInfo(
-        version_op, std::string(), version_string, version_string2));
-  }
-}
-
-GpuControlList::OsInfo::~OsInfo() {}
-
-bool GpuControlList::OsInfo::Contains(
-    OsType type, const std::string& version) const {
-  if (!IsValid())
+bool GpuControlList::More::GLVersionInfoMismatch(
+    const std::string& gl_version_string) const {
+  if (gl_version_string.empty())
     return false;
-  if (type_ != type && type_ != kOsAny)
+  if (!gl_version.IsSpecified() && gl_type == kGLTypeNone)
     return false;
-  std::string processed_version;
-  size_t pos = version.find_first_not_of("0123456789.");
-  if (pos != std::string::npos)
-    processed_version = version.substr(0, pos);
-  else
-    processed_version = version;
-
-  return version_info_->Contains(processed_version);
-}
-
-bool GpuControlList::OsInfo::IsValid() const {
-  return type_ != kOsUnknown && version_info_->IsValid();
-}
-
-GpuControlList::OsType GpuControlList::OsInfo::type() const {
-  return type_;
-}
-
-GpuControlList::OsType GpuControlList::OsInfo::StringToOsType(
-    const std::string& os) {
-  if (os == "win")
-    return kOsWin;
-  else if (os == "macosx")
-    return kOsMacosx;
-  else if (os == "android")
-    return kOsAndroid;
-  else if (os == "linux")
-    return kOsLinux;
-  else if (os == "chromeos")
-    return kOsChromeOS;
-  else if (os == "any")
-    return kOsAny;
-  return kOsUnknown;
-}
-
-GpuControlList::FloatInfo::FloatInfo(const std::string& float_op,
-                                     const std::string& float_value,
-                                     const std::string& float_value2)
-    : op_(kUnknown),
-      value_(0.f),
-      value2_(0.f) {
-  op_ = StringToNumericOp(float_op);
-  if (op_ == kAny)
-    return;
-  double dvalue = 0;
-  if (!base::StringToDouble(float_value, &dvalue)) {
-    op_ = kUnknown;
-    return;
-  }
-  value_ = static_cast<float>(dvalue);
-  if (op_ == kBetween) {
-    if (!base::StringToDouble(float_value2, &dvalue)) {
-      op_ = kUnknown;
-      return;
-    }
-    value2_ = static_cast<float>(dvalue);
-  }
-}
-
-bool GpuControlList::FloatInfo::Contains(float value) const {
-  if (op_ == kUnknown)
-    return false;
-  if (op_ == kAny)
-    return true;
-  if (op_ == kEQ)
-    return (value == value_);
-  if (op_ == kLT)
-    return (value < value_);
-  if (op_ == kLE)
-    return (value <= value_);
-  if (op_ == kGT)
-    return (value > value_);
-  if (op_ == kGE)
-    return (value >= value_);
-  DCHECK(op_ == kBetween);
-  return ((value_ <= value && value <= value2_) ||
-          (value2_ <= value && value <= value_));
-}
-
-bool GpuControlList::FloatInfo::IsValid() const {
-  return op_ != kUnknown;
-}
-
-GpuControlList::IntInfo::IntInfo(const std::string& int_op,
-                                 const std::string& int_value,
-                                 const std::string& int_value2)
-    : op_(kUnknown),
-      value_(0),
-      value2_(0) {
-  op_ = StringToNumericOp(int_op);
-  if (op_ == kAny)
-    return;
-  if (!base::StringToInt(int_value, &value_)) {
-    op_ = kUnknown;
-    return;
-  }
-  if (op_ == kBetween &&
-      !base::StringToInt(int_value2, &value2_))
-    op_ = kUnknown;
-}
-
-bool GpuControlList::IntInfo::Contains(int value) const {
-  if (op_ == kUnknown)
-    return false;
-  if (op_ == kAny)
-    return true;
-  if (op_ == kEQ)
-    return (value == value_);
-  if (op_ == kLT)
-    return (value < value_);
-  if (op_ == kLE)
-    return (value <= value_);
-  if (op_ == kGT)
-    return (value > value_);
-  if (op_ == kGE)
-    return (value >= value_);
-  DCHECK(op_ == kBetween);
-  return ((value_ <= value && value <= value2_) ||
-          (value2_ <= value && value <= value_));
-}
-
-bool GpuControlList::IntInfo::IsValid() const {
-  return op_ != kUnknown;
-}
-
-GpuControlList::BoolInfo::BoolInfo(bool value) : value_(value) {}
-
-bool GpuControlList::BoolInfo::Contains(bool value) const {
-  return value_ == value;
-}
-
-// static
-GpuControlList::ScopedGpuControlListEntry
-GpuControlList::GpuControlListEntry::GetEntryFromValue(
-    const base::DictionaryValue* value, bool top_level,
-    const FeatureMap& feature_map,
-    bool supports_feature_type_all) {
-  DCHECK(value);
-  ScopedGpuControlListEntry entry(new GpuControlListEntry());
-
-  size_t dictionary_entry_count = 0;
-
-  if (top_level) {
-    uint32_t id;
-    if (!value->GetInteger("id", reinterpret_cast<int*>(&id)) ||
-        !entry->SetId(id)) {
-      LOG(WARNING) << "Malformed id entry " << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-
-    bool disabled;
-    if (value->GetBoolean("disabled", &disabled)) {
-      entry->SetDisabled(disabled);
-      dictionary_entry_count++;
-    }
-  }
-
-  std::string description;
-  if (value->GetString("description", &description)) {
-    entry->description_ = description;
-    dictionary_entry_count++;
-  } else {
-    entry->description_ = "The GPU is unavailable for an unexplained reason.";
-  }
-
-  const base::ListValue* cr_bugs;
-  if (value->GetList("cr_bugs", &cr_bugs)) {
-    for (size_t i = 0; i < cr_bugs->GetSize(); ++i) {
-      int bug_id;
-      if (cr_bugs->GetInteger(i, &bug_id)) {
-        entry->cr_bugs_.push_back(bug_id);
-      } else {
-        LOG(WARNING) << "Malformed cr_bugs entry " << entry->id();
-        return NULL;
-      }
-    }
-    dictionary_entry_count++;
-  }
-
-  const base::ListValue* webkit_bugs;
-  if (value->GetList("webkit_bugs", &webkit_bugs)) {
-    for (size_t i = 0; i < webkit_bugs->GetSize(); ++i) {
-      int bug_id;
-      if (webkit_bugs->GetInteger(i, &bug_id)) {
-        entry->webkit_bugs_.push_back(bug_id);
-      } else {
-        LOG(WARNING) << "Malformed webkit_bugs entry " << entry->id();
-        return NULL;
-      }
-    }
-    dictionary_entry_count++;
-  }
-
-  const base::ListValue* disabled_extensions;
-  if (value->GetList("disabled_extensions", &disabled_extensions)) {
-    for (size_t i = 0; i < disabled_extensions->GetSize(); ++i) {
-      std::string disabled_extension;
-      if (disabled_extensions->GetString(i, &disabled_extension)) {
-        entry->disabled_extensions_.push_back(disabled_extension);
-      } else {
-        LOG(WARNING) << "Malformed disabled_extensions entry " << entry->id();
-        return NULL;
-      }
-    }
-    dictionary_entry_count++;
-  }
-
-  const base::DictionaryValue* os_value = NULL;
-  if (value->GetDictionary("os", &os_value)) {
-    std::string os_type;
-    std::string os_version_op = "any";
-    std::string os_version_string;
-    std::string os_version_string2;
-    os_value->GetString("type", &os_type);
-    const base::DictionaryValue* os_version_value = NULL;
-    if (os_value->GetDictionary("version", &os_version_value)) {
-      os_version_value->GetString(kOp, &os_version_op);
-      os_version_value->GetString("value", &os_version_string);
-      os_version_value->GetString("value2", &os_version_string2);
-    }
-    if (!entry->SetOsInfo(os_type, os_version_op, os_version_string,
-                          os_version_string2)) {
-      LOG(WARNING) << "Malformed os entry " << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-  }
-
-  std::string vendor_id;
-  if (value->GetString("vendor_id", &vendor_id)) {
-    if (!entry->SetVendorId(vendor_id)) {
-      LOG(WARNING) << "Malformed vendor_id entry " << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-  }
-
-  const base::ListValue* device_id_list;
-  if (value->GetList("device_id", &device_id_list)) {
-    for (size_t i = 0; i < device_id_list->GetSize(); ++i) {
-      std::string device_id;
-      if (!device_id_list->GetString(i, &device_id) ||
-          !entry->AddDeviceId(device_id)) {
-        LOG(WARNING) << "Malformed device_id entry " << entry->id();
-        return NULL;
-      }
-    }
-    dictionary_entry_count++;
-  }
-
-  std::string multi_gpu_style;
-  if (value->GetString("multi_gpu_style", &multi_gpu_style)) {
-    if (!entry->SetMultiGpuStyle(multi_gpu_style)) {
-      LOG(WARNING) << "Malformed multi_gpu_style entry " << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-  }
-
-  std::string multi_gpu_category;
-  if (value->GetString("multi_gpu_category", &multi_gpu_category)) {
-    if (!entry->SetMultiGpuCategory(multi_gpu_category)) {
-      LOG(WARNING) << "Malformed multi_gpu_category entry " << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-  }
-
-  std::string driver_vendor_value;
-  if (value->GetString("driver_vendor", &driver_vendor_value)) {
-    if (!entry->SetDriverVendorInfo(driver_vendor_value)) {
-      LOG(WARNING) << "Malformed driver_vendor entry " << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-  }
-
-  const base::DictionaryValue* driver_version_value = NULL;
-  if (value->GetDictionary("driver_version", &driver_version_value)) {
-    std::string driver_version_op = "any";
-    std::string driver_version_style;
-    std::string driver_version_string;
-    std::string driver_version_string2;
-    driver_version_value->GetString(kOp, &driver_version_op);
-    driver_version_value->GetString("style", &driver_version_style);
-    driver_version_value->GetString("value", &driver_version_string);
-    driver_version_value->GetString("value2", &driver_version_string2);
-    if (!entry->SetDriverVersionInfo(driver_version_op,
-                                     driver_version_style,
-                                     driver_version_string,
-                                     driver_version_string2)) {
-      LOG(WARNING) << "Malformed driver_version entry " << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-  }
-
-  const base::DictionaryValue* driver_date_value = NULL;
-  if (value->GetDictionary("driver_date", &driver_date_value)) {
-    std::string driver_date_op = "any";
-    std::string driver_date_string;
-    std::string driver_date_string2;
-    driver_date_value->GetString(kOp, &driver_date_op);
-    driver_date_value->GetString("value", &driver_date_string);
-    driver_date_value->GetString("value2", &driver_date_string2);
-    if (!entry->SetDriverDateInfo(driver_date_op, driver_date_string,
-                                  driver_date_string2)) {
-      LOG(WARNING) << "Malformed driver_date entry " << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-  }
-
-  std::string gl_type;
-  if (value->GetString("gl_type", &gl_type)) {
-    if (!entry->SetGLType(gl_type)) {
-      LOG(WARNING) << "Malformed gl_type entry " << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-  }
-
-  const base::DictionaryValue* gl_version_value = NULL;
-  if (value->GetDictionary("gl_version", &gl_version_value)) {
-    std::string version_op = "any";
-    std::string version_string;
-    std::string version_string2;
-    gl_version_value->GetString(kOp, &version_op);
-    gl_version_value->GetString("value", &version_string);
-    gl_version_value->GetString("value2", &version_string2);
-    if (!entry->SetGLVersionInfo(
-            version_op, version_string, version_string2)) {
-      LOG(WARNING) << "Malformed gl_version entry " << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-  }
-
-  std::string gl_version_string_value;
-  if (value->GetString("gl_version_string", &gl_version_string_value)) {
-    if (!entry->SetGLVersionStringInfo(gl_version_string_value)) {
-      LOG(WARNING) << "Malformed gl_version_string entry " << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-  }
-
-  std::string gl_vendor_value;
-  if (value->GetString("gl_vendor", &gl_vendor_value)) {
-    if (!entry->SetGLVendorInfo(gl_vendor_value)) {
-      LOG(WARNING) << "Malformed gl_vendor entry " << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-  }
-
-  std::string gl_renderer_value;
-  if (value->GetString("gl_renderer", &gl_renderer_value)) {
-    if (!entry->SetGLRendererInfo(gl_renderer_value)) {
-      LOG(WARNING) << "Malformed gl_renderer entry " << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-  }
-
-  std::string gl_extensions_value;
-  if (value->GetString("gl_extensions", &gl_extensions_value)) {
-    if (!entry->SetGLExtensionsInfo(gl_extensions_value)) {
-      LOG(WARNING) << "Malformed gl_extensions entry " << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-  }
-
-  const base::DictionaryValue* gl_reset_notification_strategy_value = NULL;
-  if (value->GetDictionary("gl_reset_notification_strategy",
-                           &gl_reset_notification_strategy_value)) {
-    std::string op;
-    std::string int_value;
-    std::string int_value2;
-    gl_reset_notification_strategy_value->GetString(kOp, &op);
-    gl_reset_notification_strategy_value->GetString("value", &int_value);
-    gl_reset_notification_strategy_value->GetString("value2", &int_value2);
-    if (!entry->SetGLResetNotificationStrategyInfo(
-            op, int_value, int_value2)) {
-      LOG(WARNING) << "Malformed gl_reset_notification_strategy entry "
-                   << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-  }
-
-  std::string cpu_brand_value;
-  if (value->GetString("cpu_info", &cpu_brand_value)) {
-    if (!entry->SetCpuBrand(cpu_brand_value)) {
-      LOG(WARNING) << "Malformed cpu_brand entry " << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-  }
-
-  const base::DictionaryValue* perf_graphics_value = NULL;
-  if (value->GetDictionary("perf_graphics", &perf_graphics_value)) {
-    std::string op;
-    std::string float_value;
-    std::string float_value2;
-    perf_graphics_value->GetString(kOp, &op);
-    perf_graphics_value->GetString("value", &float_value);
-    perf_graphics_value->GetString("value2", &float_value2);
-    if (!entry->SetPerfGraphicsInfo(op, float_value, float_value2)) {
-      LOG(WARNING) << "Malformed perf_graphics entry " << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-  }
-
-  const base::DictionaryValue* perf_gaming_value = NULL;
-  if (value->GetDictionary("perf_gaming", &perf_gaming_value)) {
-    std::string op;
-    std::string float_value;
-    std::string float_value2;
-    perf_gaming_value->GetString(kOp, &op);
-    perf_gaming_value->GetString("value", &float_value);
-    perf_gaming_value->GetString("value2", &float_value2);
-    if (!entry->SetPerfGamingInfo(op, float_value, float_value2)) {
-      LOG(WARNING) << "Malformed perf_gaming entry " << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-  }
-
-  const base::DictionaryValue* perf_overall_value = NULL;
-  if (value->GetDictionary("perf_overall", &perf_overall_value)) {
-    std::string op;
-    std::string float_value;
-    std::string float_value2;
-    perf_overall_value->GetString(kOp, &op);
-    perf_overall_value->GetString("value", &float_value);
-    perf_overall_value->GetString("value2", &float_value2);
-    if (!entry->SetPerfOverallInfo(op, float_value, float_value2)) {
-      LOG(WARNING) << "Malformed perf_overall entry " << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-  }
-
-  const base::ListValue* machine_model_name_list;
-  if (value->GetList("machine_model_name", &machine_model_name_list)) {
-    for (size_t i = 0; i < machine_model_name_list->GetSize(); ++i) {
-      std::string model_name;
-      if (!machine_model_name_list->GetString(i, &model_name) ||
-          !entry->AddMachineModelName(model_name)) {
-        LOG(WARNING) << "Malformed machine_model_name entry " << entry->id();
-        return NULL;
-      }
-    }
-    dictionary_entry_count++;
-  }
-
-  const base::DictionaryValue* machine_model_version_value = NULL;
-  if (value->GetDictionary(
-          "machine_model_version", &machine_model_version_value)) {
-    std::string version_op = "any";
-    std::string version_string;
-    std::string version_string2;
-    machine_model_version_value->GetString(kOp, &version_op);
-    machine_model_version_value->GetString("value", &version_string);
-    machine_model_version_value->GetString("value2", &version_string2);
-    if (!entry->SetMachineModelVersionInfo(
-            version_op, version_string, version_string2)) {
-      LOG(WARNING) << "Malformed machine_model_version entry " << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-  }
-
-  const base::DictionaryValue* gpu_count_value = NULL;
-  if (value->GetDictionary("gpu_count", &gpu_count_value)) {
-    std::string op;
-    std::string int_value;
-    std::string int_value2;
-    gpu_count_value->GetString(kOp, &op);
-    gpu_count_value->GetString("value", &int_value);
-    gpu_count_value->GetString("value2", &int_value2);
-    if (!entry->SetGpuCountInfo(op, int_value, int_value2)) {
-      LOG(WARNING) << "Malformed gpu_count entry " << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-  }
-
-  bool direct_rendering;
-  if (value->GetBoolean("direct_rendering", &direct_rendering)) {
-    entry->SetDirectRenderingInfo(direct_rendering);
-    dictionary_entry_count++;
-  }
-
-  bool in_process_gpu;
-  if (value->GetBoolean("in_process_gpu", &in_process_gpu)) {
-    entry->SetInProcessGPUInfo(in_process_gpu);
-    dictionary_entry_count++;
-  }
-
-  const base::DictionaryValue* pixel_shader_version_value = NULL;
-  if (value->GetDictionary("pixel_shader_version",
-                           &pixel_shader_version_value)) {
-    std::string pixel_shader_version_op = "any";
-    std::string pixel_shader_version_string;
-    std::string pixel_shader_version_string2;
-    pixel_shader_version_value->GetString(kOp, &pixel_shader_version_op);
-    pixel_shader_version_value->GetString("value",
-                                          &pixel_shader_version_string);
-    pixel_shader_version_value->GetString("value2",
-                                          &pixel_shader_version_string2);
-    if (!entry->SetPixelShaderVersionInfo(pixel_shader_version_op,
-                                          pixel_shader_version_string,
-                                          pixel_shader_version_string2)) {
-      LOG(WARNING) << "Malformed pixel shader version entry " << entry->id();
-      return NULL;
-    }
-    dictionary_entry_count++;
-  }
-
-  if (top_level) {
-    const base::ListValue* feature_value = NULL;
-    if (value->GetList("features", &feature_value)) {
-      std::vector<std::string> feature_list;
-      std::vector<std::string> feature_exception_list;
-      for (size_t i = 0; i < feature_value->GetSize(); ++i) {
-        std::string feature;
-        const base::DictionaryValue* features_info_value = NULL;
-        if (feature_value->GetString(i, &feature)) {
-          feature_list.push_back(feature);
-        } else if (feature_value->GetDictionary(i, &features_info_value)) {
-          const base::ListValue* exception_list_value = NULL;
-          if (features_info_value->size() > 1) {
-            LOG(WARNING) << "Malformed feature entry " << entry->id();
-            return NULL;
-          }
-          if (features_info_value->GetList("exceptions",
-                                           &exception_list_value)) {
-            for (size_t i = 0; i < exception_list_value->GetSize(); ++i) {
-              std::string exception_feature;
-              if (exception_list_value->GetString(i, &exception_feature)) {
-                feature_exception_list.push_back(exception_feature);
-              } else {
-                LOG(WARNING) << "Malformed feature entry " << entry->id();
-                return NULL;
-              }
-            }
-          } else {
-            LOG(WARNING) << "Malformed feature entry " << entry->id();
-            return NULL;
-          }
-        } else {
-          LOG(WARNING) << "Malformed feature entry " << entry->id();
-          return NULL;
-        }
-      }
-      if (!entry->SetFeatures(feature_list, feature_exception_list, feature_map,
-                              supports_feature_type_all)) {
-        LOG(WARNING) << "Malformed feature entry " << entry->id();
-        return NULL;
-      }
-      dictionary_entry_count++;
-    }
-  }
-
-  if (top_level) {
-    const base::ListValue* exception_list_value = NULL;
-    if (value->GetList("exceptions", &exception_list_value)) {
-      for (size_t i = 0; i < exception_list_value->GetSize(); ++i) {
-        const base::DictionaryValue* exception_value = NULL;
-        if (!exception_list_value->GetDictionary(i, &exception_value)) {
-          LOG(WARNING) << "Malformed exceptions entry " << entry->id();
-          return NULL;
-        }
-        ScopedGpuControlListEntry exception(GetEntryFromValue(
-            exception_value, false, feature_map, supports_feature_type_all));
-        if (exception.get() == NULL) {
-          LOG(WARNING) << "Malformed exceptions entry " << entry->id();
-          return NULL;
-        }
-        // Exception should inherit vendor_id from parent, otherwise if only
-        // device_ids are specified in Exception, the info will be incomplete.
-        if (exception->vendor_id_ == 0 && entry->vendor_id_ != 0)
-          exception->vendor_id_ = entry->vendor_id_;
-        entry->AddException(exception);
-      }
-      dictionary_entry_count++;
-    }
-  }
-
-  if (value->size() != dictionary_entry_count) {
-    LOG(WARNING) << "Entry with unknown fields " << entry->id();
-    return NULL;
-  }
-
-  // If GL_VERSION is specified, but no info about whether it's GL or GLES,
-  // we use the default for the platform.  See GLType enum declaration.
-  if (entry->gl_version_info_.get() != NULL && entry->gl_type_ == kGLTypeNone)
-    entry->gl_type_ = GetDefaultGLType();
-
-  return entry;
-}
-
-GpuControlList::GpuControlListEntry::GpuControlListEntry()
-    : id_(0),
-      disabled_(false),
-      vendor_id_(0),
-      multi_gpu_style_(kMultiGpuStyleNone),
-      multi_gpu_category_(kMultiGpuCategoryActive),
-      gl_type_(kGLTypeNone) {
-}
-
-GpuControlList::GpuControlListEntry::~GpuControlListEntry() { }
-
-bool GpuControlList::GpuControlListEntry::SetId(uint32_t id) {
-  if (id != 0) {
-    id_ = id;
-    return true;
-  }
-  return false;
-}
-
-void GpuControlList::GpuControlListEntry::SetDisabled(bool disabled) {
-  disabled_ = disabled;
-}
-
-bool GpuControlList::GpuControlListEntry::SetOsInfo(
-    const std::string& os,
-    const std::string& version_op,
-    const std::string& version_string,
-    const std::string& version_string2) {
-  os_info_.reset(new OsInfo(os, version_op, version_string, version_string2));
-  return os_info_->IsValid();
-}
-
-bool GpuControlList::GpuControlListEntry::SetVendorId(
-    const std::string& vendor_id_string) {
-  vendor_id_ = 0;
-  return base::HexStringToUInt(vendor_id_string, &vendor_id_) &&
-      vendor_id_ != 0;
-}
-
-bool GpuControlList::GpuControlListEntry::AddDeviceId(
-    const std::string& device_id_string) {
-  uint32_t device_id = 0;
-  if (base::HexStringToUInt(device_id_string, &device_id) && device_id != 0) {
-    device_id_list_.push_back(device_id);
-    return true;
-  }
-  return false;
-}
-
-bool GpuControlList::GpuControlListEntry::SetMultiGpuStyle(
-    const std::string& multi_gpu_style_string) {
-  MultiGpuStyle style = StringToMultiGpuStyle(multi_gpu_style_string);
-  if (style == kMultiGpuStyleNone)
-    return false;
-  multi_gpu_style_ = style;
-  return true;
-}
-
-bool GpuControlList::GpuControlListEntry::SetMultiGpuCategory(
-    const std::string& multi_gpu_category_string) {
-  MultiGpuCategory category =
-      StringToMultiGpuCategory(multi_gpu_category_string);
-  if (category == kMultiGpuCategoryNone)
-    return false;
-  multi_gpu_category_ = category;
-  return true;
-}
-
-bool GpuControlList::GpuControlListEntry::SetGLType(
-    const std::string& gl_type_string) {
-  GLType gl_type = StringToGLType(gl_type_string);
-  if (gl_type == kGLTypeNone)
-    return false;
-  gl_type_ = gl_type;
-  return true;
-}
-
-bool GpuControlList::GpuControlListEntry::SetDriverVendorInfo(
-    const std::string& vendor_value) {
-  driver_vendor_info_ = vendor_value;
-  return !driver_vendor_info_.empty();
-}
-
-bool GpuControlList::GpuControlListEntry::SetDriverVersionInfo(
-    const std::string& version_op,
-    const std::string& version_style,
-    const std::string& version_string,
-    const std::string& version_string2) {
-  driver_version_info_.reset(new VersionInfo(
-      version_op, version_style, version_string, version_string2));
-  return driver_version_info_->IsValid();
-}
-
-bool GpuControlList::GpuControlListEntry::SetDriverDateInfo(
-    const std::string& date_op,
-    const std::string& date_string,
-    const std::string& date_string2) {
-  driver_date_info_.reset(
-      new VersionInfo(date_op, std::string(), date_string, date_string2));
-  return driver_date_info_->IsValid();
-}
-
-bool GpuControlList::GpuControlListEntry::SetGLVersionInfo(
-    const std::string& version_op,
-    const std::string& version_string,
-    const std::string& version_string2) {
-  gl_version_info_.reset(new VersionInfo(
-      version_op, std::string(), version_string, version_string2));
-  return gl_version_info_->IsValid();
-}
-
-bool GpuControlList::GpuControlListEntry::SetGLVersionStringInfo(
-    const std::string& version_string_value) {
-  gl_version_string_info_ = version_string_value;
-  return !gl_version_string_info_.empty();
-}
-
-bool GpuControlList::GpuControlListEntry::SetGLVendorInfo(
-    const std::string& vendor_value) {
-  gl_vendor_info_ = vendor_value;
-  return !gl_vendor_info_.empty();
-}
-
-bool GpuControlList::GpuControlListEntry::SetGLRendererInfo(
-    const std::string& renderer_value) {
-  gl_renderer_info_ = renderer_value;
-  return !gl_renderer_info_.empty();
-}
-
-bool GpuControlList::GpuControlListEntry::SetGLExtensionsInfo(
-    const std::string& extensions_value) {
-  gl_extensions_info_ = extensions_value;
-  return !gl_extensions_info_.empty();
-}
-
-bool GpuControlList::GpuControlListEntry::SetGLResetNotificationStrategyInfo(
-    const std::string& op,
-    const std::string& int_string,
-    const std::string& int_string2) {
-  gl_reset_notification_strategy_info_.reset(
-      new IntInfo(op, int_string, int_string2));
-  return gl_reset_notification_strategy_info_->IsValid();
-}
-
-bool GpuControlList::GpuControlListEntry::SetCpuBrand(
-    const std::string& cpu_value) {
-  cpu_brand_ = cpu_value;
-  return !cpu_brand_.empty();
-}
-
-bool GpuControlList::GpuControlListEntry::SetPerfGraphicsInfo(
-    const std::string& op,
-    const std::string& float_string,
-    const std::string& float_string2) {
-  perf_graphics_info_.reset(new FloatInfo(op, float_string, float_string2));
-  return perf_graphics_info_->IsValid();
-}
-
-bool GpuControlList::GpuControlListEntry::SetPerfGamingInfo(
-    const std::string& op,
-    const std::string& float_string,
-    const std::string& float_string2) {
-  perf_gaming_info_.reset(new FloatInfo(op, float_string, float_string2));
-  return perf_gaming_info_->IsValid();
-}
-
-bool GpuControlList::GpuControlListEntry::SetPerfOverallInfo(
-    const std::string& op,
-    const std::string& float_string,
-    const std::string& float_string2) {
-  perf_overall_info_.reset(new FloatInfo(op, float_string, float_string2));
-  return perf_overall_info_->IsValid();
-}
-
-bool GpuControlList::GpuControlListEntry::AddMachineModelName(
-    const std::string& model_name) {
-  if (model_name.empty())
-    return false;
-  machine_model_name_list_.push_back(model_name);
-  return true;
-}
-
-bool GpuControlList::GpuControlListEntry::SetMachineModelVersionInfo(
-    const std::string& version_op,
-    const std::string& version_string,
-    const std::string& version_string2) {
-  machine_model_version_info_.reset(new VersionInfo(
-      version_op, std::string(), version_string, version_string2));
-  return machine_model_version_info_->IsValid();
-}
-
-bool GpuControlList::GpuControlListEntry::SetGpuCountInfo(
-    const std::string& op,
-    const std::string& int_string,
-    const std::string& int_string2) {
-  gpu_count_info_.reset(new IntInfo(op, int_string, int_string2));
-  return gpu_count_info_->IsValid();
-}
-
-void GpuControlList::GpuControlListEntry::SetDirectRenderingInfo(bool value) {
-  direct_rendering_info_.reset(new BoolInfo(value));
-}
-
-void GpuControlList::GpuControlListEntry::SetInProcessGPUInfo(bool value) {
-  in_process_gpu_info_.reset(new BoolInfo(value));
-}
-
-bool GpuControlList::GpuControlListEntry::SetFeatures(
-    const std::vector<std::string>& feature_strings,
-    const std::vector<std::string>& exception_strings,
-    const FeatureMap& feature_map,
-    bool supports_feature_type_all) {
-  size_t size = feature_strings.size();
-  if (size == 0)
-    return false;
-  features_.clear();
-  for (size_t i = 0; i < size; ++i) {
-    int feature = 0;
-    if (supports_feature_type_all && feature_strings[i] == "all") {
-      for (FeatureMap::const_iterator iter = feature_map.begin();
-           iter != feature_map.end(); ++iter) {
-        if (std::find(exception_strings.begin(), exception_strings.end(),
-                      iter->first) == exception_strings.end())
-          features_.insert(iter->second);
-      }
-      continue;
-    }
-    if (!StringToFeature(feature_strings[i], &feature, feature_map)) {
-      features_.clear();
-      return false;
-    }
-    if (std::find(exception_strings.begin(), exception_strings.end(),
-                  feature_strings[i]) == exception_strings.end())
-      features_.insert(feature);
-  }
-  return true;
-}
-
-bool GpuControlList::GpuControlListEntry::SetPixelShaderVersionInfo(
-    const std::string& version_op,
-    const std::string& version_string,
-    const std::string& version_string2) {
-  pixel_shader_version_info_.reset(new VersionInfo(
-      version_op, std::string(), version_string, version_string2));
-  return pixel_shader_version_info_->IsValid();
-}
-
-void GpuControlList::GpuControlListEntry::AddException(
-    ScopedGpuControlListEntry exception) {
-  exceptions_.push_back(exception);
-}
-
-bool GpuControlList::GpuControlListEntry::GLVersionInfoMismatch(
-    const std::string& gl_version) const {
-  if (gl_version.empty())
-    return false;
-
-  if (gl_version_info_.get() == NULL && gl_type_ == kGLTypeNone)
-    return false;
-
   std::vector<std::string> segments = base::SplitString(
-      gl_version, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
+      gl_version_string, " ", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   std::string number;
-  GLType gl_type = kGLTypeNone;
+  GLType target_gl_type = kGLTypeNone;
   if (segments.size() > 2 &&
       segments[0] == "OpenGL" && segments[1] == "ES") {
     bool full_match = RE2::FullMatch(segments[2], "([\\d.]+).*", &number);
     DCHECK(full_match);
 
-    gl_type = kGLTypeGLES;
+    target_gl_type = kGLTypeGLES;
     if (segments.size() > 3 &&
         base::StartsWith(segments[3], "(ANGLE",
                          base::CompareCase::INSENSITIVE_ASCII)) {
-      gl_type = kGLTypeANGLE;
+      target_gl_type = kGLTypeANGLE;
     }
   } else {
     number = segments[0];
-    gl_type = kGLTypeGL;
+    target_gl_type = kGLTypeGL;
   }
 
-  if (gl_type_ != kGLTypeNone && gl_type_ != gl_type)
+  GLType entry_gl_type = gl_type;
+  if (entry_gl_type == kGLTypeNone && gl_version.IsSpecified()) {
+    entry_gl_type = GetDefaultGLType();
+  }
+  if (entry_gl_type != kGLTypeNone && entry_gl_type != target_gl_type) {
     return true;
-  if (gl_version_info_.get() != NULL && !gl_version_info_->Contains(number))
+  }
+  if (gl_version.IsSpecified() && !gl_version.Contains(number)) {
     return true;
+  }
   return false;
 }
 
 // static
-GpuControlList::GpuControlListEntry::MultiGpuStyle
-GpuControlList::GpuControlListEntry::StringToMultiGpuStyle(
-    const std::string& style) {
-  if (style == kMultiGpuStyleStringOptimus)
-    return kMultiGpuStyleOptimus;
-  if (style == kMultiGpuStyleStringAMDSwitchable)
-    return kMultiGpuStyleAMDSwitchable;
-  if (style == kMultiGpuStyleStringAMDSwitchableIntegrated)
-    return kMultiGpuStyleAMDSwitchableIntegrated;
-  if (style == kMultiGpuStyleStringAMDSwitchableDiscrete)
-    return kMultiGpuStyleAMDSwitchableDiscrete;
-  return kMultiGpuStyleNone;
-}
-
-// static
-GpuControlList::GpuControlListEntry::MultiGpuCategory
-GpuControlList::GpuControlListEntry::StringToMultiGpuCategory(
-    const std::string& category) {
-  if (category == kMultiGpuCategoryStringPrimary)
-    return kMultiGpuCategoryPrimary;
-  if (category == kMultiGpuCategoryStringSecondary)
-    return kMultiGpuCategorySecondary;
-  if (category == kMultiGpuCategoryStringActive)
-    return kMultiGpuCategoryActive;
-  if (category == kMultiGpuCategoryStringAny)
-    return kMultiGpuCategoryAny;
-  return kMultiGpuCategoryNone;
-}
-
-// static
-GpuControlList::GpuControlListEntry::GLType
-GpuControlList::GpuControlListEntry::StringToGLType(
-    const std::string& gl_type) {
-  if (gl_type == kGLTypeStringGL)
-    return kGLTypeGL;
-  if (gl_type == kGLTypeStringGLES)
-    return kGLTypeGLES;
-  if (gl_type == kGLTypeStringANGLE)
-    return kGLTypeANGLE;
-  return kGLTypeNone;
-}
-
-// static
-GpuControlList::GpuControlListEntry::GLType
-GpuControlList::GpuControlListEntry::GetDefaultGLType() {
+GpuControlList::GLType GpuControlList::More::GetDefaultGLType() {
 #if defined(OS_CHROMEOS)
   return kGLTypeGL;
 #elif defined(OS_LINUX) || defined(OS_OPENBSD)
@@ -1196,23 +219,105 @@ GpuControlList::GpuControlListEntry::GetDefaultGLType() {
 #endif
 }
 
-void GpuControlList::GpuControlListEntry::LogControlListMatch(
+void GpuControlList::Entry::LogControlListMatch(
     const std::string& control_list_logging_name) const {
   static const char kControlListMatchMessage[] =
       "Control list match for rule #%u in %s.";
-  VLOG(1) << base::StringPrintf(kControlListMatchMessage, id_,
+  VLOG(1) << base::StringPrintf(kControlListMatchMessage, id,
                                 control_list_logging_name.c_str());
 }
 
-bool GpuControlList::GpuControlListEntry::Contains(
-    OsType os_type, const std::string& os_version,
-    const GPUInfo& gpu_info) const {
-  DCHECK(os_type != kOsAny);
-  if (os_info_.get() != NULL && !os_info_->Contains(os_type, os_version))
+bool GpuControlList::DriverInfo::Contains(const GPUInfo& gpu_info) const {
+  if (StringMismatch(gpu_info.driver_vendor, driver_vendor)) {
+    return false;
+  }
+  if (driver_version.IsSpecified() && !gpu_info.driver_version.empty() &&
+      !driver_version.Contains(gpu_info.driver_version)) {
+    return false;
+  }
+  if (driver_date.IsSpecified() && !gpu_info.driver_date.empty() &&
+      !driver_date.Contains(gpu_info.driver_date, '-')) {
+    return false;
+  }
+  return true;
+}
+
+bool GpuControlList::GLStrings::Contains(const GPUInfo& gpu_info) const {
+  if (StringMismatch(gpu_info.gl_version, gl_version))
+    return false;
+  if (StringMismatch(gpu_info.gl_vendor, gl_vendor))
+    return false;
+  if (StringMismatch(gpu_info.gl_renderer, gl_renderer))
+    return false;
+  if (StringMismatch(gpu_info.gl_extensions, gl_extensions))
+    return false;
+  return true;
+}
+
+bool GpuControlList::MachineModelInfo::Contains(const GPUInfo& gpu_info) const {
+  if (machine_model_name_size > 0) {
+    if (gpu_info.machine_model_name.empty())
+      return false;
+    bool found_match = false;
+    for (size_t ii = 0; ii < machine_model_name_size; ++ii) {
+      if (RE2::FullMatch(gpu_info.machine_model_name,
+                         machine_model_names[ii])) {
+        found_match = true;
+        break;
+      }
+    }
+    if (!found_match)
+      return false;
+  }
+  if (machine_model_version.IsSpecified() &&
+      (gpu_info.machine_model_version.empty() ||
+       !machine_model_version.Contains(gpu_info.machine_model_version))) {
+    return false;
+  }
+  return true;
+}
+
+bool GpuControlList::More::Contains(const GPUInfo& gpu_info) const {
+  if (GLVersionInfoMismatch(gpu_info.gl_version)) {
+    return false;
+  }
+  if (gl_reset_notification_strategy != 0 &&
+      gl_reset_notification_strategy !=
+          gpu_info.gl_reset_notification_strategy) {
+    return false;
+  }
+  if (gpu_count.IsSpecified()) {
+    size_t count = gpu_info.secondary_gpus.size() + 1;
+    if (!gpu_count.Contains(std::to_string(count))) {
+      return false;
+    }
+  }
+  if (!direct_rendering && gpu_info.direct_rendering) {
+    return false;
+  }
+  if (in_process_gpu && !gpu_info.in_process_gpu) {
+    return false;
+  }
+  if (pixel_shader_version.IsSpecified() &&
+      !pixel_shader_version.Contains(gpu_info.pixel_shader_version)) {
     return false;
-  if (vendor_id_ != 0) {
+  }
+  return true;
+}
+
+bool GpuControlList::Conditions::Contains(OsType target_os_type,
+                                          const std::string& target_os_version,
+                                          const GPUInfo& gpu_info) const {
+  DCHECK(target_os_type != kOsAny);
+  if (os_type != kOsAny) {
+    if (os_type != target_os_type)
+      return false;
+    if (os_version.IsSpecified() && !os_version.Contains(target_os_version))
+      return false;
+  }
+  if (vendor_id != 0) {
     std::vector<GPUInfo::GPUDevice> candidates;
-    switch (multi_gpu_category_) {
+    switch (multi_gpu_category) {
       case kMultiGpuCategoryPrimary:
         candidates.push_back(gpu_info.gpu);
         break;
@@ -1224,6 +329,8 @@ bool GpuControlList::GpuControlListEntry::Contains(
         candidates.push_back(gpu_info.gpu);
         break;
       case kMultiGpuCategoryActive:
+      case kMultiGpuCategoryNone:
+        // If gpu category is not specified, default to the active gpu.
         if (gpu_info.gpu.active || gpu_info.secondary_gpus.empty())
           candidates.push_back(gpu_info.gpu);
         for (size_t ii = 0; ii < gpu_info.secondary_gpus.size(); ++ii) {
@@ -1232,14 +339,12 @@ bool GpuControlList::GpuControlListEntry::Contains(
         }
         if (candidates.empty())
           candidates.push_back(gpu_info.gpu);
-      default:
-        break;
     }
 
     GPUInfo::GPUDevice gpu;
-    gpu.vendor_id = vendor_id_;
+    gpu.vendor_id = vendor_id;
     bool found = false;
-    if (device_id_list_.empty()) {
+    if (device_id_size == 0) {
       for (size_t ii = 0; ii < candidates.size(); ++ii) {
         if (gpu.vendor_id == candidates[ii].vendor_id) {
           found = true;
@@ -1247,8 +352,8 @@ bool GpuControlList::GpuControlListEntry::Contains(
         }
       }
     } else {
-      for (size_t ii = 0; ii < device_id_list_.size(); ++ii) {
-        gpu.device_id = device_id_list_[ii];
+      for (size_t ii = 0; ii < device_id_size; ++ii) {
+        gpu.device_id = device_ids[ii];
         for (size_t jj = 0; jj < candidates.size(); ++jj) {
           if (gpu.vendor_id == candidates[jj].vendor_id &&
               gpu.device_id == candidates[jj].device_id) {
@@ -1261,7 +366,7 @@ bool GpuControlList::GpuControlListEntry::Contains(
     if (!found)
       return false;
   }
-  switch (multi_gpu_style_) {
+  switch (multi_gpu_style) {
     case kMultiGpuStyleOptimus:
       if (!gpu_info.optimus)
         return false;
@@ -1289,219 +394,108 @@ bool GpuControlList::GpuControlListEntry::Contains(
     case kMultiGpuStyleNone:
       break;
   }
-  if (StringMismatch(gpu_info.driver_vendor, driver_vendor_info_))
+  if (driver_info && !driver_info->Contains(gpu_info)) {
     return false;
-  if (driver_version_info_.get() != NULL && !gpu_info.driver_version.empty()) {
-    if (!driver_version_info_->Contains(gpu_info.driver_version))
-      return false;
   }
-  if (driver_date_info_.get() != NULL && !gpu_info.driver_date.empty()) {
-    if (!driver_date_info_->Contains(gpu_info.driver_date, '-'))
-      return false;
-  }
-  if (GLVersionInfoMismatch(gpu_info.gl_version))
-    return false;
-  if (StringMismatch(gpu_info.gl_version, gl_version_string_info_))
-    return false;
-  if (StringMismatch(gpu_info.gl_vendor, gl_vendor_info_))
+  if (gl_strings && !gl_strings->Contains(gpu_info)) {
     return false;
-  if (StringMismatch(gpu_info.gl_renderer, gl_renderer_info_))
-    return false;
-  if (StringMismatch(gpu_info.gl_extensions, gl_extensions_info_))
-    return false;
-  if (gl_reset_notification_strategy_info_.get() != NULL &&
-      !gl_reset_notification_strategy_info_->Contains(
-          gpu_info.gl_reset_notification_strategy))
-    return false;
-  if (!machine_model_name_list_.empty()) {
-    if (gpu_info.machine_model_name.empty())
-      return false;
-    bool found_match = false;
-    for (size_t ii = 0; ii < machine_model_name_list_.size(); ++ii) {
-      if (RE2::FullMatch(gpu_info.machine_model_name,
-                         machine_model_name_list_[ii])) {
-        found_match = true;
-        break;
-      }
-    }
-    if (!found_match)
-      return false;
   }
-  if (machine_model_version_info_.get() != NULL &&
-      (gpu_info.machine_model_version.empty() ||
-       !machine_model_version_info_->Contains(gpu_info.machine_model_version)))
-    return false;
-  if (gpu_count_info_.get() != NULL &&
-      !gpu_count_info_->Contains(gpu_info.secondary_gpus.size() + 1))
-    return false;
-  if (direct_rendering_info_.get() != NULL &&
-      !direct_rendering_info_->Contains(gpu_info.direct_rendering))
-    return false;
-  if (in_process_gpu_info_.get() != NULL &&
-      !in_process_gpu_info_->Contains(gpu_info.in_process_gpu))
+  if (machine_model_info && !machine_model_info->Contains(gpu_info)) {
     return false;
-  if (!cpu_brand_.empty()) {
-    base::CPU cpu_info;
-    if (StringMismatch(cpu_info.cpu_brand(), cpu_brand_))
-      return false;
   }
-  if (pixel_shader_version_info_.get() != NULL) {
-    if (!pixel_shader_version_info_->Contains(gpu_info.pixel_shader_version))
-      return false;
+  if (more && !more->Contains(gpu_info)) {
+    return false;
   }
+  return true;
+}
 
-  for (size_t i = 0; i < exceptions_.size(); ++i) {
-    if (exceptions_[i]->Contains(os_type, os_version, gpu_info) &&
-        !exceptions_[i]->NeedsMoreInfo(gpu_info, true))
+bool GpuControlList::Entry::Contains(OsType target_os_type,
+                                     const std::string& target_os_version,
+                                     const GPUInfo& gpu_info) const {
+  if (!conditions.Contains(target_os_type, target_os_version, gpu_info)) {
+    return false;
+  }
+  for (size_t ii = 0; ii < exception_size; ++ii) {
+    if (exceptions[ii].Contains(target_os_type, target_os_version, gpu_info) &&
+        !exceptions[ii].NeedsMoreInfo(gpu_info)) {
       return false;
+    }
   }
   return true;
 }
 
-bool GpuControlList::GpuControlListEntry::NeedsMoreInfo(
-    const GPUInfo& gpu_info,
-    bool consider_exceptions) const {
+bool GpuControlList::Conditions::NeedsMoreInfo(const GPUInfo& gpu_info) const {
   // We only check for missing info that might be collected with a gl context.
   // If certain info is missing due to some error, say, we fail to collect
   // vendor_id/device_id, then even if we launch GPU process and create a gl
   // context, we won't gather such missing info, so we still return false.
-  if (!driver_vendor_info_.empty() && gpu_info.driver_vendor.empty())
-    return true;
-  if (driver_version_info_.get() && gpu_info.driver_version.empty())
-    return true;
-  if ((gl_version_info_.get() || !gl_version_string_info_.empty()) &&
+  if (driver_info) {
+    if (driver_info->driver_vendor && gpu_info.driver_vendor.empty()) {
+      return true;
+    }
+    if (driver_info->driver_version.IsSpecified() &&
+        gpu_info.driver_version.empty()) {
+      return true;
+    }
+  }
+  if (((more && more->gl_version.IsSpecified()) ||
+       (gl_strings && gl_strings->gl_version)) &&
       gpu_info.gl_version.empty()) {
     return true;
   }
-  if (!gl_vendor_info_.empty() && gpu_info.gl_vendor.empty())
+  if (gl_strings && gl_strings->gl_vendor && gpu_info.gl_vendor.empty())
     return true;
-  if (!gl_renderer_info_.empty() && gpu_info.gl_renderer.empty())
+  if (gl_strings && gl_strings->gl_renderer && gpu_info.gl_renderer.empty())
     return true;
-  if (pixel_shader_version_info_.get() != NULL &&
-      gpu_info.pixel_shader_version.empty())
+  if (more && more->pixel_shader_version.IsSpecified() &&
+      gpu_info.pixel_shader_version.empty()) {
     return true;
+  }
+  return false;
+}
 
+bool GpuControlList::Entry::NeedsMoreInfo(const GPUInfo& gpu_info,
+                                          bool consider_exceptions) const {
+  if (conditions.NeedsMoreInfo(gpu_info))
+    return true;
   if (consider_exceptions) {
-    for (size_t i = 0; i < exceptions_.size(); ++i) {
-      if (exceptions_[i]->NeedsMoreInfo(gpu_info, consider_exceptions))
+    for (size_t ii = 0; ii < exception_size; ++ii) {
+      if (exceptions[ii].NeedsMoreInfo(gpu_info))
         return true;
     }
   }
-
   return false;
 }
 
-GpuControlList::OsType GpuControlList::GpuControlListEntry::GetOsType() const {
-  if (os_info_.get() == NULL)
-    return kOsAny;
-  return os_info_->type();
-}
-
-uint32_t GpuControlList::GpuControlListEntry::id() const {
-  return id_;
-}
-
-bool GpuControlList::GpuControlListEntry::disabled() const {
-  return disabled_;
-}
-
-const std::set<int>& GpuControlList::GpuControlListEntry::features() const {
-  return features_;
-}
-
-void GpuControlList::GpuControlListEntry::GetFeatureNames(
+void GpuControlList::Entry::GetFeatureNames(
     base::ListValue* feature_names,
-    const FeatureMap& feature_map,
-    bool supports_feature_type_all) const {
+    const FeatureMap& feature_map) const {
   DCHECK(feature_names);
-  if (supports_feature_type_all && features_.size() == feature_map.size()) {
-    feature_names->AppendString("all");
-    return;
-  }
-  for (FeatureMap::const_iterator iter = feature_map.begin();
-       iter != feature_map.end(); ++iter) {
-    if (features_.count(iter->second) > 0)
-      feature_names->AppendString(iter->first);
-  }
-}
-
-// static
-bool GpuControlList::GpuControlListEntry::StringToFeature(
-    const std::string& feature_name, int* feature_id,
-    const FeatureMap& feature_map) {
-  FeatureMap::const_iterator iter = feature_map.find(feature_name);
-  if (iter != feature_map.end()) {
-    *feature_id = iter->second;
-    return true;
+  for (size_t ii = 0; ii < feature_size; ++ii) {
+    auto iter = feature_map.find(features[ii]);
+    DCHECK(iter != feature_map.end());
+    feature_names->AppendString(iter->second);
   }
-  return false;
 }
 
-GpuControlList::GpuControlList()
-    : max_entry_id_(0),
+GpuControlList::GpuControlList(const GpuControlListData& data)
+    : version_(data.version),
+      entry_count_(data.entry_count),
+      entries_(data.entries),
+      max_entry_id_(0),
       needs_more_info_(false),
-      supports_feature_type_all_(false),
       control_list_logging_enabled_(false) {
+  DCHECK_LT(0u, entry_count_);
+  // Assume the newly last added entry has the largest ID.
+  max_entry_id_ = entries_[entry_count_ - 1].id;
 }
 
 GpuControlList::~GpuControlList() {
-  Clear();
-}
-
-bool GpuControlList::LoadList(
-    const std::string& json_context,
-    GpuControlList::OsFilter os_filter) {
-  std::unique_ptr<base::DictionaryValue> root =
-      base::DictionaryValue::From(base::JSONReader::Read(json_context));
-  if (!root)
-    return false;
-  return LoadList(*root, os_filter);
-}
-
-bool GpuControlList::LoadList(const base::DictionaryValue& parsed_json,
-                              GpuControlList::OsFilter os_filter) {
-  std::vector<ScopedGpuControlListEntry> entries;
-
-  parsed_json.GetString("version", &version_);
-  std::vector<std::string> pieces;
-  if (!ProcessVersionString(version_, '.', &pieces))
-    return false;
-
-  const base::ListValue* list = NULL;
-  if (!parsed_json.GetList("entries", &list))
-    return false;
-
-  uint32_t max_entry_id = 0;
-  for (size_t i = 0; i < list->GetSize(); ++i) {
-    const base::DictionaryValue* list_item = NULL;
-    bool valid = list->GetDictionary(i, &list_item);
-    if (!valid || list_item == NULL)
-      return false;
-    ScopedGpuControlListEntry entry(GpuControlListEntry::GetEntryFromValue(
-        list_item, true, feature_map_, supports_feature_type_all_));
-    if (entry.get() == NULL)
-      return false;
-    if (entry->id() > max_entry_id)
-      max_entry_id = entry->id();
-    entries.push_back(entry);
-  }
-
-  Clear();
-  OsType my_os = GetOsType();
-  for (size_t i = 0; i < entries.size(); ++i) {
-    OsType entry_os = entries[i]->GetOsType();
-    if (os_filter == GpuControlList::kAllOs ||
-        entry_os == kOsAny || entry_os == my_os)
-      entries_.push_back(entries[i]);
-  }
-  max_entry_id_ = max_entry_id;
-  return true;
 }
 
-std::set<int> GpuControlList::MakeDecision(
-    GpuControlList::OsType os,
-    std::string os_version,
-    const GPUInfo& gpu_info) {
+std::set<int> GpuControlList::MakeDecision(GpuControlList::OsType os,
+                                           const std::string& os_version,
+                                           const GPUInfo& gpu_info) {
   active_entries_.clear();
   std::set<int> features;
 
@@ -1515,37 +509,42 @@ std::set<int> GpuControlList::MakeDecision(
 
   if (os == kOsAny)
     os = GetOsType();
-  if (os_version.empty())
-    os_version = base::SysInfo::OperatingSystemVersion();
-
-  for (size_t i = 0; i < entries_.size(); ++i) {
-    ScopedGpuControlListEntry entry = entries_[i];
-    if (entry->Contains(os, os_version, gpu_info)) {
-      bool needs_more_info_main = entry->NeedsMoreInfo(gpu_info, false);
-      bool needs_more_info_exception = entry->NeedsMoreInfo(gpu_info, true);
-
-      if (!entry->disabled()) {
-        if (control_list_logging_enabled_)
-          entry->LogControlListMatch(control_list_logging_name_);
-        // Only look at main entry info when deciding what to add to "features"
-        // set. If we don't have enough info for an exception, it's safer if we
-        // just ignore the exception and assume the exception doesn't apply.
-        for (std::set<int>::const_iterator iter = entry->features().begin();
-             iter != entry->features().end(); ++iter) {
-          if (needs_more_info_main) {
-            if (!features.count(*iter))
-              potential_features.insert(*iter);
-          } else {
-            features.insert(*iter);
-            potential_features.erase(*iter);
-            if (!needs_more_info_exception)
-              permanent_features.insert(*iter);
-          }
+  std::string processed_os_version = os_version;
+  if (processed_os_version.empty())
+    processed_os_version = base::SysInfo::OperatingSystemVersion();
+  // Get rid of the non numbers because later processing expects a valid
+  // version string in the format of "a.b.c".
+  size_t pos = processed_os_version.find_first_not_of("0123456789.");
+  if (pos != std::string::npos)
+    processed_os_version = processed_os_version.substr(0, pos);
+
+  for (size_t ii = 0; ii < entry_count_; ++ii) {
+    const Entry& entry = entries_[ii];
+    DCHECK_NE(0u, entry.id);
+    if (entry.Contains(os, processed_os_version, gpu_info)) {
+      bool needs_more_info_main = entry.NeedsMoreInfo(gpu_info, false);
+      bool needs_more_info_exception = entry.NeedsMoreInfo(gpu_info, true);
+
+      if (control_list_logging_enabled_)
+        entry.LogControlListMatch(control_list_logging_name_);
+      // Only look at main entry info when deciding what to add to "features"
+      // set. If we don't have enough info for an exception, it's safer if we
+      // just ignore the exception and assume the exception doesn't apply.
+      for (size_t jj = 0; jj < entry.feature_size; ++jj) {
+        int feature = entry.features[jj];
+        if (needs_more_info_main) {
+          if (!features.count(feature))
+            potential_features.insert(feature);
+        } else {
+          features.insert(feature);
+          potential_features.erase(feature);
+          if (!needs_more_info_exception)
+            permanent_features.insert(feature);
         }
       }
 
       if (!needs_more_info_main)
-        active_entries_.push_back(entry);
+        active_entries_.push_back(ii);
     }
   }
 
@@ -1554,26 +553,24 @@ std::set<int> GpuControlList::MakeDecision(
   return features;
 }
 
-void GpuControlList::GetDecisionEntries(std::vector<uint32_t>* entry_ids,
-                                        bool disabled) const {
+void GpuControlList::GetDecisionEntries(
+    std::vector<uint32_t>* entry_ids) const {
   DCHECK(entry_ids);
   entry_ids->clear();
-  for (size_t i = 0; i < active_entries_.size(); ++i) {
-    if (disabled == active_entries_[i]->disabled())
-      entry_ids->push_back(active_entries_[i]->id());
+  for (auto index : active_entries_) {
+    DCHECK_LT(index, entry_count_);
+    entry_ids->push_back(entries_[index].id);
   }
 }
 
 std::vector<std::string> GpuControlList::GetDisabledExtensions() {
   std::set<std::string> disabled_extensions;
-  for (size_t i = 0; i < active_entries_.size(); ++i) {
-    GpuControlListEntry* entry = active_entries_[i].get();
-
-    if (entry->disabled())
-      continue;
-
-    disabled_extensions.insert(entry->disabled_extensions().begin(),
-                               entry->disabled_extensions().end());
+  for (auto index : active_entries_) {
+    DCHECK_LT(index, entry_count_);
+    const Entry& entry = entries_[index];
+    for (size_t ii = 0; ii < entry.disabled_extension_size; ++ii) {
+      disabled_extensions.insert(entry.disabled_extensions[ii]);
+    }
   }
   return std::vector<std::string>(disabled_extensions.begin(),
                                   disabled_extensions.end());
@@ -1582,27 +579,19 @@ std::vector<std::string> GpuControlList::GetDisabledExtensions() {
 void GpuControlList::GetReasons(base::ListValue* problem_list,
                                 const std::string& tag) const {
   DCHECK(problem_list);
-  for (size_t i = 0; i < active_entries_.size(); ++i) {
-    GpuControlListEntry* entry = active_entries_[i].get();
-    if (entry->disabled())
-      continue;
+  for (auto index : active_entries_) {
+    const Entry& entry = entries_[index];
     std::unique_ptr<base::DictionaryValue> problem(new base::DictionaryValue());
 
-    problem->SetString("description", entry->description());
+    problem->SetString("description", entry.description);
 
     base::ListValue* cr_bugs = new base::ListValue();
-    for (size_t j = 0; j < entry->cr_bugs().size(); ++j)
-      cr_bugs->AppendInteger(entry->cr_bugs()[j]);
+    for (size_t jj = 0; jj < entry.cr_bug_size; ++jj)
+      cr_bugs->AppendInteger(entry.cr_bugs[jj]);
     problem->Set("crBugs", cr_bugs);
 
-    base::ListValue* webkit_bugs = new base::ListValue();
-    for (size_t j = 0; j < entry->webkit_bugs().size(); ++j) {
-      webkit_bugs->AppendInteger(entry->webkit_bugs()[j]);
-    }
-    problem->Set("webkitBugs", webkit_bugs);
-
     base::ListValue* features = new base::ListValue();
-    entry->GetFeatureNames(features, feature_map_, supports_feature_type_all_);
+    entry.GetFeatureNames(features, feature_map_);
     problem->Set("affectedGpuSettings", features);
 
     DCHECK(tag == "workarounds" || tag == "disabledFeatures");
@@ -1613,18 +602,7 @@ void GpuControlList::GetReasons(base::ListValue* problem_list,
 }
 
 size_t GpuControlList::num_entries() const {
-  return entries_.size();
-}
-
-bool GpuControlList::has_duplicated_entry_id() const {
-  std::set<int> ids;
-  for (size_t i = 0; i < entries_.size(); ++i) {
-    if (ids.count(entries_[i]->id()) == 0)
-      ids.insert(entries_[i]->id());
-    else
-      return true;
-  }
-  return false;
+  return entry_count_;
 }
 
 uint32_t GpuControlList::max_entry_id() const {
@@ -1635,6 +613,7 @@ std::string GpuControlList::version() const {
   return version_;
 }
 
+// static
 GpuControlList::OsType GpuControlList::GetOsType() {
 #if defined(OS_CHROMEOS)
   return kOsChromeOS;
@@ -1647,44 +626,13 @@ GpuControlList::OsType GpuControlList::GetOsType() {
 #elif defined(OS_MACOSX)
   return kOsMacosx;
 #else
-  return kOsUnknown;
+  return kOsAny;
 #endif
 }
 
-void GpuControlList::Clear() {
-  entries_.clear();
-  active_entries_.clear();
-  max_entry_id_ = 0;
-}
-
-// static
-GpuControlList::NumericOp GpuControlList::StringToNumericOp(
-    const std::string& op) {
-  if (op == "=")
-    return kEQ;
-  if (op == "<")
-    return kLT;
-  if (op == "<=")
-    return kLE;
-  if (op == ">")
-    return kGT;
-  if (op == ">=")
-    return kGE;
-  if (op == "any")
-    return kAny;
-  if (op == "between")
-    return kBetween;
-  return kUnknown;
-}
-
 void GpuControlList::AddSupportedFeature(
     const std::string& feature_name, int feature_id) {
-  feature_map_[feature_name] = feature_id;
-}
-
-void GpuControlList::set_supports_feature_type_all(bool supported) {
-  supports_feature_type_all_ = supported;
+  feature_map_[feature_id] = feature_name;
 }
 
 }  // namespace gpu
-