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

chrome/test/base/ui_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/test/base/ui_test_utils.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
@@ skipping 228 matching lines @@
 
   // Nothing more to do for callers that ignore the returned JS value.
   if (!result)
     return true;
 
   // Wrap |json| in an array before deserializing because valid JSON has an
   // array or an object as the root.
   json.insert(0, "[");
   json.append("]");
 
-  scoped_ptr<Value> root_val(base::JSONReader::Read(json, true));
+  scoped_ptr<Value> root_val(
+      base::JSONReader::Read(json, base::JSON_ALLOW_TRAILING_COMMAS));
   if (!root_val->IsType(Value::TYPE_LIST)) {
     DLOG(ERROR) << "JSON result is not a list.";
     return false;
   }
 
   ListValue* list = static_cast<ListValue*>(root_val.get());
   Value* result_val;
   if (!list || !list->GetSize() ||
       // Remove gives us ownership of the value.
       !list->Remove(0, &result_val)) {
@@ skipping 838 matching lines @@
     const wchar_t* script =
         L"window.domAutomationController.send("
         L"    JSON.stringify([document.width, document.height]))";
     std::string json;
     if (!ui_test_utils::ExecuteJavaScriptAndExtractString(
             rvh, L"", script, &json))
       return false;
 
     // Parse the JSON.
     std::vector<int> dimensions;
-    scoped_ptr<Value> value(base::JSONReader::Read(json, true));
+    scoped_ptr<Value> value(
+        base::JSONReader::Read(json, base::JSON_ALLOW_TRAILING_COMMAS));
     if (!value->IsType(Value::TYPE_LIST))
       return false;
     ListValue* list = static_cast<ListValue*>(value.get());
     int width, height;
     if (!list->GetInteger(0, &width) || !list->GetInteger(1, &height))
       return false;
 
     // Take the snapshot.
     gfx::Size page_size(width, height);
     return TakeRenderWidgetSnapshot(rvh, page_size, page_size, bitmap);
@@ skipping 35 matching lines @@
                int state,
                const base::Closure& followup) {
   if (!followup.is_null())
     ui_controls::SendMouseEventsNotifyWhenDone(button, state, followup);
   else
     ui_controls::SendMouseEvents(button, state);
 }
 
 }  // namespace internal
 }  // namespace ui_test_utils