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

chrome/browser/extensions/extension_function_test_utils.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/extensions/extension_function_test_utils.h"
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/json/json_reader.h"
@@ skipping 26 matching lines @@
   }
 
   Browser* browser_;
 };
 
 }  // namespace
 
 namespace extension_function_test_utils {
 
 base::Value* ParseJSON(const std::string& data) {
-  const bool kAllowTrailingComma = false;
-  return base::JSONReader::Read(data, kAllowTrailingComma);
+  return base::JSONReader::Read(data);
 }
 
 base::ListValue* ParseList(const std::string& data) {
   scoped_ptr<base::Value> result(ParseJSON(data));
   if (result.get() && result->IsType(base::Value::TYPE_LIST))
     return static_cast<base::ListValue*>(result.release());
   else
     return NULL;
 }
 
@@ skipping 149 matching lines @@
   if (!response_delegate.HasResponse()) {
     response_delegate.set_should_post_quit(true);
     ui_test_utils::RunMessageLoop();
   }
 
   EXPECT_TRUE(response_delegate.HasResponse());
   return response_delegate.GetResponse();
 }
 
 } // namespace extension_function_test_utils