Relax software rendering list parsing.

content/browser/gpu/gpu_blacklist.h

Index: content/browser/gpu/gpu_blacklist.h
===================================================================
--- content/browser/gpu/gpu_blacklist.h	(revision 96607)
+++ content/browser/gpu/gpu_blacklist.h	(working copy)
@@ -39,11 +39,17 @@
   // current_os_only==true indicates all blacklist entries that don't belong to
   // the current OS are discarded; current_os_only==false should only be used
   // for testing purpose.
+  // tolerate_errors==true indicates ignore entries that cause processing
+  // errors but keep the rest - this is important for backward compatibility
+  // when new fields are added; tolerate_errors==false should only be used for
+  // testing purpose.
   // If failed, the current GpuBlacklist is un-touched.
   bool LoadGpuBlacklist(const std::string& json_context,
-                        bool current_os_only);
+                        bool current_os_only,
+                        bool tolerate_errors);
   bool LoadGpuBlacklist(const base::DictionaryValue& parsed_json,
-                        bool current_os_only);
+                        bool current_os_only,
+                        bool tolerate_errors);
 
   // Collects system information and combines them with gpu_info and blacklist
   // information to determine gpu feature flags.
@@ -63,7 +69,6 @@
   void GetGpuFeatureFlagEntries(GpuFeatureFlags::GpuFeatureType feature,
                                 std::vector<uint32>& entry_ids) const;
 
-
   // Returns status information on the blacklist. This is two parted:
   // {
   //    featureStatus: []
@@ -96,6 +101,9 @@
                                 bool disable_experimental_webgl,
                                 bool disable_multisampling) const;
 
+  // Returns the number of entries.
+  size_t num_entries() const;
+
   // Return the largest entry id.  This is used for histogramming.
   uint32 max_entry_id() const;