Relax software rendering list parsing.

chrome/browser/web_resource/gpu_blacklist_updater.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 "chrome/browser/web_resource/gpu_blacklist_updater.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 86 matching lines @@
 
 void GpuBlacklistUpdater::InitializeGpuBlacklist() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // We first load it from the browser resources.
   const base::StringPiece gpu_blacklist_json(
       ResourceBundle::GetSharedInstance().GetRawDataResource(
           IDR_GPU_BLACKLIST));
   GpuBlacklist* built_in_list = new GpuBlacklist(GetChromeVersionString());
   bool succeed = built_in_list->LoadGpuBlacklist(
-      gpu_blacklist_json.as_string(), true);
+      gpu_blacklist_json.as_string(),
+      GpuBlacklist::kCurrentOsOnly,
+      GpuBlacklist::kIgnoreExceptionWithUnknownField);
   DCHECK(succeed);
   GpuDataManager::GetInstance()->SetBuiltInGpuBlacklist(built_in_list);
 
   // Then we check if the cached version is more up-to-date.
   const DictionaryValue* gpu_blacklist_cache =
       prefs_->GetDictionary(prefs::kGpuBlacklist);
   DCHECK(gpu_blacklist_cache);
   UpdateGpuBlacklist(*gpu_blacklist_cache, true);
 }
 
 void GpuBlacklistUpdater::UpdateGpuBlacklist(
     const DictionaryValue& gpu_blacklist_cache, bool preliminary) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   scoped_ptr<GpuBlacklist> gpu_blacklist(
       new GpuBlacklist(GetChromeVersionString()));
-  if (gpu_blacklist->LoadGpuBlacklist(gpu_blacklist_cache, true)) {
+  bool success = gpu_blacklist->LoadGpuBlacklist(
+      gpu_blacklist_cache,
+      GpuBlacklist::kCurrentOsOnly,
+      GpuBlacklist::kIgnoreExceptionWithUnknownField);
+  if (success) {
     GpuDataManager::GetInstance()->UpdateGpuBlacklist(
         gpu_blacklist.release(), preliminary);
   }
 }