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

chrome/browser/automation/testing_automation_provider.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/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 2180 matching lines @@
       }
   }
 }
 
 void TestingAutomationProvider::SendJSONRequest(int handle,
                                                 const std::string& json_request,
                                                 IPC::Message* reply_message) {
   scoped_ptr<Value> values;
   base::JSONReader reader;
   std::string error;
-  values.reset(reader.ReadAndReturnError(json_request, true, NULL, &error));
+  values.reset(reader.ReadAndReturnError(json_request,
+      base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error));
   if (!error.empty()) {
     AutomationJSONReply(this, reply_message).SendError(error);
     return;
   }
 
   // Make sure input is a dict with a string command.
   std::string command;
   DictionaryValue* dict_value = NULL;
   if (values->GetType() != Value::TYPE_DICTIONARY) {
     AutomationJSONReply(this, reply_message).SendError("not a dict");
@@ skipping 4840 matching lines @@
       *browser_handle = browser_tracker_->Add(browser);
       *success = true;
     }
   }
 }
 
 void TestingAutomationProvider::OnRemoveProvider() {
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }