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

chrome/browser/translate/translate_manager.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/translate/translate_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/json/json_reader.h"
@@ skipping 202 matching lines @@
     return;
   }
   static const size_t kLanguageListCallbackNameLength =
       strlen(kLanguageListCallbackName);
   std::string languages_json = language_list.substr(
       kLanguageListCallbackNameLength,
       language_list.size() - kLanguageListCallbackNameLength - 1);
   // JSON doesn't support single quotes though this is what is used on the
   // translate server so we must replace them with double quotes.
   ReplaceSubstringsAfterOffset(&languages_json, 0, "'", "\"");
-  scoped_ptr<Value> json_value(base::JSONReader::Read(languages_json, true));
+  scoped_ptr<Value> json_value(
+      base::JSONReader::Read(languages_json, base::JSON_ALLOW_TRAILING_COMMAS));
   if (json_value == NULL || !json_value->IsType(Value::TYPE_DICTIONARY)) {
     NOTREACHED();
     return;
   }
   // The first level dictionary contains two sub-dict, one for source languages
   // and the other for target languages, we want to use the target languages.
   DictionaryValue* language_dict =
       static_cast<DictionaryValue*>(json_value.get());
   DictionaryValue* target_languages = NULL;
   if (!language_dict->GetDictionary(kTargetLanguagesKey, &target_languages) ||
@@ skipping 664 matching lines @@
   InfoBarTabHelper* infobar_helper = wrapper->infobar_tab_helper();
 
   for (size_t i = 0; i < infobar_helper->infobar_count(); ++i) {
     TranslateInfoBarDelegate* delegate =
         infobar_helper->GetInfoBarDelegateAt(i)->AsTranslateInfoBarDelegate();
     if (delegate)
       return delegate;
   }
   return NULL;
 }