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

chrome/browser/ui/webui/chromeos/mobile_setup_ui.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/ui/webui/chromeos/mobile_setup_ui.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 376 matching lines @@
     LOG(ERROR) << "Error loading cellular config file: " <<
         kCellularConfigPath;
   }
 }
 
 bool CellularConfigDocument::LoadFromFile(const FilePath& config_path) {
   std::string config;
   if (!file_util::ReadFileToString(config_path, &config))
     return false;
 
-  scoped_ptr<Value> root(base::JSONReader::Read(config, true));
+  scoped_ptr<Value> root(
+      base::JSONReader::Read(config, base::JSON_ALLOW_TRAILING_COMMAS));
   DCHECK(root.get() != NULL);
   if (!root.get() || root->GetType() != Value::TYPE_DICTIONARY) {
     LOG(WARNING) << "Bad cellular config file";
     return false;
   }
 
   DictionaryValue* root_dict = static_cast<DictionaryValue*>(root.get());
   if (!root_dict->GetString(kVersionField, &version_)) {
     LOG(WARNING) << "Cellular config file missing version";
     return false;
@@ skipping 993 matching lines @@
 
   // Set up the chrome://mobilesetup/ source.
   Profile* profile = Profile::FromWebUI(web_ui);
   profile->GetChromeURLDataManager()->AddDataSource(html_source);
 }
 
 void MobileSetupUI::RenderViewCreated(RenderViewHost* host) {
   // Destroyed by the corresponding RenderViewHost
   new PortalFrameLoadObserver(AsWeakPtr(), host);
 }