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

chrome/browser/extensions/chrome_app_api_browsertest.cc

 // Copyright (c) 2011 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 <string>
 
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string_number_conversions.h"
@@ skipping 79 matching lines @@
   EXPECT_TRUE(IsAppInstalled());
 
   // Check that an app page returns the correct result for
   // chrome.app.getDetails().
   ui_test_utils::NavigateToURL(browser(), app_url);
   ASSERT_TRUE(
       ui_test_utils::ExecuteJavaScriptAndExtractString(
           browser()->GetSelectedWebContents()->GetRenderViewHost(),
           L"", get_app_details, &result));
   scoped_ptr<DictionaryValue> app_details(
-      static_cast<DictionaryValue*>(
-          base::JSONReader::Read(result, false /* allow trailing comma */)));
+      static_cast<DictionaryValue*>(base::JSONReader::Read(result)));
   // extension->manifest() does not contain the id.
   app_details->Remove("id", NULL);
   EXPECT_TRUE(app_details.get());
   EXPECT_TRUE(app_details->Equals(extension->manifest()->value()));
 
   // Try to change app.isInstalled.  Should silently fail, so
   // that isInstalled should have the initial value.
   ASSERT_TRUE(
       ui_test_utils::ExecuteJavaScriptAndExtractString(
           browser()->GetSelectedWebContents()->GetRenderViewHost(),
@@ skipping 57 matching lines @@
   std::wstring get_details_for_frame =
       L"window.domAutomationController.send("
       L"    JSON.stringify(chrome.app.getDetailsForFrame(frames[0])))";
   std::string json;
   ASSERT_TRUE(
       ui_test_utils::ExecuteJavaScriptAndExtractString(
           browser()->GetSelectedWebContents()->GetRenderViewHost(),
           L"", get_details_for_frame, &json));
 
   scoped_ptr<DictionaryValue> app_details(
-      static_cast<DictionaryValue*>(
-          base::JSONReader::Read(json, false /* allow trailing comma */)));
+      static_cast<DictionaryValue*>(base::JSONReader::Read(json)));
   // extension->manifest() does not contain the id.
   app_details->Remove("id", NULL);
   EXPECT_TRUE(app_details.get());
   EXPECT_TRUE(app_details->Equals(extension->manifest()->value()));
 }