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

chrome/browser/chromeos/customization_document.cc

Index: chrome/browser/chromeos/customization_document.cc
diff --git a/chrome/browser/chromeos/customization_document.cc b/chrome/browser/chromeos/customization_document.cc
index f0434de20414ebd18db8f9214f2159866b3df2bd..01bdb8ec6cef34a71cea79b18697c157ec122a93 100644
--- a/chrome/browser/chromeos/customization_document.cc
+++ b/chrome/browser/chromeos/customization_document.cc
@@ -92,9 +92,7 @@ bool CustomizationDocument::LoadManifestFromString(
   int error_code = 0;
   std::string error;
   scoped_ptr<Value> root(base::JSONReader::ReadAndReturnError(manifest,
-                                                              true,
-                                                              &error_code,
-                                                              &error));
+      base::JSON_ALLOW_TRAILING_COMMAS, &error_code, &error));
   if (error_code != base::JSONReader::JSON_NO_ERROR)
     LOG(ERROR) << error;
   DCHECK(root.get() != NULL);