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

chrome/browser/extensions/extension_menu_manager_unittest.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 <vector>
 
 #include "base/json/json_reader.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ skipping 449 matching lines @@
                   GURL(),
                   ExtensionEventRouter::USER_GESTURE_ENABLED))
       .Times(1)
       .WillOnce(SaveArg<2>(&event_args));
 
   manager_.ExecuteCommand(&profile, NULL /* tab_contents */, params, id);
 
   // Parse the json event_args, which should turn into a 2-element list where
   // the first element is a dictionary we want to inspect for the correct
   // values.
-  scoped_ptr<Value> result(base::JSONReader::Read(event_args, true));
+  scoped_ptr<Value> result(
+      base::JSONReader::Read(event_args, base::JSON_ALLOW_TRAILING_COMMAS));
   Value* value = result.get();
   ASSERT_TRUE(result.get() != NULL);
   ASSERT_EQ(Value::TYPE_LIST, value->GetType());
   ListValue* list = static_cast<ListValue*>(value);
   ASSERT_EQ(2u, list->GetSize());
 
   DictionaryValue* info;
   ASSERT_TRUE(list->GetDictionary(0, &info));
 
   int tmp_id = 0;
@@ skipping 100 matching lines @@
   manager_.ChangeParent(child1->id(), NULL);
   ASSERT_TRUE(new_item->checked());
   ASSERT_TRUE(child1->checked());
 
   // Removing |parent| should cause only |child1| to be selected.
   manager_.RemoveContextMenuItem(parent->id());
   parent = NULL;
   ASSERT_FALSE(new_item->checked());
   ASSERT_TRUE(child1->checked());
 }