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

gpu/tools/compositor_model_bench/render_tree.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 "gpu/tools/compositor_model_bench/render_tree.h"
 
 #include <sstream>
 #include <vector>
 
 #include "base/file_path.h"
@@ skipping 443 matching lines @@
 RenderNode* BuildRenderTreeFromFile(const FilePath& path) {
   LOG(INFO) << "Reading " << path.LossyDisplayName();
   string contents;
   if (!ReadFileToString(path, &contents))
     return NULL;
 
   scoped_ptr<Value> root;
   int error_code = 0;
   string error_message;
   root.reset(JSONReader::ReadAndReturnError(contents,
-            true,
+            base::JSON_ALLOW_TRAILING_COMMAS,
             &error_code,
             &error_message));
   if (!root.get()) {
     LOG(ERROR) << "Failed to parse JSON file " << path.LossyDisplayName() <<
         "\n(" << error_message << ")";
     return NULL;
   }
 
   if (root->IsType(Value::TYPE_DICTIONARY)) {
     DictionaryValue* v = static_cast<DictionaryValue*>(root.get());
     RenderNode* tree = InterpretContentLayer(v);
     return tree;
   } else {
     LOG(ERROR) << path.LossyDisplayName() <<
         " doesn not encode a JSON dictionary.";
     return NULL;
   }
 }