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

chrome/test/automation/browser_proxy.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/automation/browser_proxy.h"
 
 #include <algorithm>
 
 #include "base/json/json_reader.h"
 #include "base/logging.h"
@@ skipping 587 matching lines @@
   const char* kJSONCommand = "{\"command\": \"GetInitialLoadTimes\"}";
 
   *max_stop_time = 0;
   *min_start_time = -1;
   if (!SendJSONRequest(kJSONCommand, timeout_ms, &json_response)) {
     // Older browser versions do not support GetInitialLoadTimes.
     // Fail gracefully and do not record them in this case.
     return false;
   }
   std::string error;
-  base::JSONReader reader;
-  scoped_ptr<Value> values(reader.ReadAndReturnError(json_response, true,
-                                                     NULL, &error));
+  scoped_ptr<Value> values(base::JSONReader::ReadAndReturnError(
+      json_response, base::JSON_ALLOW_TRAILING_COMMAS, NULL, &error));
   if (!error.empty() || values->GetType() != Value::TYPE_DICTIONARY)
     return false;
 
   DictionaryValue* values_dict = static_cast<DictionaryValue*>(values.get());
 
   Value* tabs_value;
   if (!values_dict->Get("tabs", &tabs_value) ||
       tabs_value->GetType() != Value::TYPE_LIST)
     return false;
 
@@ skipping 22 matching lines @@
     if (i == 0)
       *min_start_time = start_ms;
 
     *min_start_time = std::min(start_ms, *min_start_time);
     *max_stop_time = std::max(stop_ms, *max_stop_time);
     stop_times->push_back(stop_ms);
   }
   std::sort(stop_times->begin(), stop_times->end());
   return true;
 }