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

net/base/transport_security_state.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 "net/base/transport_security_state.h"
 
 #if defined(USE_OPENSSL)
 #include <openssl/ecdsa.h>
 #include <openssl/ssl.h>
 #else  // !defined(USE_OPENSSL)
@@ skipping 899 matching lines @@
     if (pins.GetString(i, &type_and_base64))
       AddHash(type_and_base64, hashes);
   }
 }
 
 // static
 bool TransportSecurityState::Deserialise(
     const std::string& input,
     bool* dirty,
     std::map<std::string, DomainState>* out) {
-  scoped_ptr<Value> value(
-      base::JSONReader::Read(input, false /* do not allow trailing commas */));
+  scoped_ptr<Value> value(base::JSONReader::Read(input));
   if (!value.get() || !value->IsType(Value::TYPE_DICTIONARY))
     return false;
 
   DictionaryValue* dict_value = reinterpret_cast<DictionaryValue*>(value.get());
   const base::Time current_time(base::Time::Now());
   bool dirtied = false;
 
   for (DictionaryValue::key_iterator i = dict_value->begin_keys();
        i != dict_value->end_keys(); ++i) {
     DictionaryValue* state;
@@ skipping 725 matching lines @@
 
   return true;
 }
 
 bool TransportSecurityState::DomainState::ShouldRedirectHTTPToHTTPS()
     const {
   return mode == MODE_STRICT;
 }
 
 }  // namespace