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

chrome/browser/themes/browser_theme_pack_unittest.cc

Index: chrome/browser/themes/browser_theme_pack_unittest.cc
diff --git a/chrome/browser/themes/browser_theme_pack_unittest.cc b/chrome/browser/themes/browser_theme_pack_unittest.cc
index c13c72f780feefc33ee1c1c068080f7e13fcc0c3..bcf81ef4f629f08c49d37ec5fd9d40c43d079311 100644
--- a/chrome/browser/themes/browser_theme_pack_unittest.cc
+++ b/chrome/browser/themes/browser_theme_pack_unittest.cc
@@ -79,7 +79,7 @@ class BrowserThemePackTest : public ::testing::Test {
   }
 
   void LoadColorJSON(const std::string& json) {
-    scoped_ptr<Value> value(base::JSONReader::Read(json, false));
+    scoped_ptr<Value> value(base::JSONReader::Read(json));
     ASSERT_TRUE(value->IsType(Value::TYPE_DICTIONARY));
     LoadColorDictionary(static_cast<DictionaryValue*>(value.get()));
   }
@@ -89,7 +89,7 @@ class BrowserThemePackTest : public ::testing::Test {
   }
 
   void LoadTintJSON(const std::string& json) {
-    scoped_ptr<Value> value(base::JSONReader::Read(json, false));
+    scoped_ptr<Value> value(base::JSONReader::Read(json));
     ASSERT_TRUE(value->IsType(Value::TYPE_DICTIONARY));
     LoadTintDictionary(static_cast<DictionaryValue*>(value.get()));
   }
@@ -99,7 +99,7 @@ class BrowserThemePackTest : public ::testing::Test {
   }
 
   void LoadDisplayPropertiesJSON(const std::string& json) {
-    scoped_ptr<Value> value(base::JSONReader::Read(json, false));
+    scoped_ptr<Value> value(base::JSONReader::Read(json));
     ASSERT_TRUE(value->IsType(Value::TYPE_DICTIONARY));
     LoadDisplayPropertiesDictionary(static_cast<DictionaryValue*>(value.get()));
   }
@@ -110,7 +110,7 @@ class BrowserThemePackTest : public ::testing::Test {
 
   void ParseImageNamesJSON(const std::string& json,
                        std::map<int, FilePath>* out_file_paths) {
-    scoped_ptr<Value> value(base::JSONReader::Read(json, false));
+    scoped_ptr<Value> value(base::JSONReader::Read(json));
     ASSERT_TRUE(value->IsType(Value::TYPE_DICTIONARY));
     ParseImageNamesDictionary(static_cast<DictionaryValue*>(value.get()),
                               out_file_paths);