Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1776)

Unified Diff: chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc

Issue 9960077: Modify the base::JSONReader interface to take a set of options rather than a boolean flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
index 08710f2bfd10fac827b80b7e724ee44d115f4075..cc8ca0e2752945b7b8ef8fa872df4ab6dbc6af8c 100644
--- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
+++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc
@@ -394,7 +394,8 @@ bool CellularConfigDocument::LoadFromFile(const FilePath& config_path) {
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";

Powered by Google App Engine
This is Rietveld 408576698