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

net/base/crl_set.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 "base/base64.h"
 #include "base/format_macros.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/string_util.h"
@@ skipping 120 matching lines @@
   memcpy(&header_len, data->data(), 2);  // assumes little-endian.
   data->remove_prefix(2);
 
   if (data->size() < header_len)
     return NULL;
 
   const base::StringPiece header_bytes(data->data(), header_len);
   data->remove_prefix(header_len);
 
   scoped_ptr<Value> header(base::JSONReader::Read(
-      header_bytes.as_string(), true /* allow trailing comma */));
+      header_bytes.as_string(), base::JSON_ALLOW_TRAILING_COMMAS));
   if (header.get() == NULL)
     return NULL;
 
   if (!header->IsType(Value::TYPE_DICTIONARY))
     return NULL;
   return reinterpret_cast<base::DictionaryValue*>(header.release());
 }
 
 // kCurrentFileVersion is the version of the CRLSet file format that we
 // currently implement.
@@ skipping 436 matching lines @@
   return new CRLSet;
 }
 
 CRLSet* CRLSet::ExpiredCRLSetForTesting() {
   CRLSet* crl_set = new CRLSet;
   crl_set->not_after_ = 1;
   return crl_set;
 }
 
 }  // namespace net