Modify the base::JSONReader interface to take a set of options rather than a boolean flag.

chrome/browser/content_settings/content_settings_policy_provider.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 "chrome/browser/content_settings/content_settings_policy_provider.h"
 
 #include <string>
 #include <vector>
 
 #include "base/json/json_reader.h"
@@ skipping 285 matching lines @@
   //      }
   //   }
   // }
   for (size_t j = 0; j < pattern_filter_str_list->GetSize(); ++j) {
     std::string pattern_filter_json;
     if (!pattern_filter_str_list->GetString(j, &pattern_filter_json)) {
       NOTREACHED();
       continue;
     }
 
-    scoped_ptr<base::Value> value(
-        base::JSONReader::Read(pattern_filter_json, true));
+    scoped_ptr<base::Value> value(base::JSONReader::Read(pattern_filter_json,
+        base::JSON_ALLOW_TRAILING_COMMAS));
     if (!value.get()) {
       VLOG(1) << "Ignoring invalid certificate auto select setting. Reason:"
                  " Invalid JSON format: " << pattern_filter_json;
       continue;
     }
 
     scoped_ptr<base::DictionaryValue> pattern_filter_pair(
         static_cast<base::DictionaryValue*>(value.release()));
     std::string pattern_str;
     bool pattern_read = pattern_filter_pair->GetString("pattern", &pattern_str);
@@ skipping 138 matching lines @@
     NOTREACHED() << "Unexpected notification";
     return;
   }
   NotifyObservers(ContentSettingsPattern(),
                   ContentSettingsPattern(),
                   CONTENT_SETTINGS_TYPE_DEFAULT,
                   std::string());
 }
 
 }  // namespace content_settings