detect preferences errors

BUG=38352
TEST=none

Review URL: http://codereview.chromium.org/1120006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43715 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 5 insertions, 5 deletions

diff --git a/chrome/test/automation/javascript_execution_controller.cc b/chrome/test/automation/javascript_execution_controller.cc
index 26d32d0..3cd0753 100644
--- a/chrome/test/automation/javascript_execution_controller.cc
+++ b/chrome/test/automation/javascript_execution_controller.cc
@@ -72,7 +72,7 @@ bool JavaScriptExecutionController::ParseJSON(const std::string& json,
                                               scoped_ptr<Value>* result) {
   JSONStringValueSerializer parse(json);
   std::string parsing_error;
-  scoped_ptr<Value> root_value(parse.Deserialize(&parsing_error));
+  scoped_ptr<Value> root_value(parse.Deserialize(NULL, &parsing_error));
 
   if (!root_value.get()) {
     if (parsing_error.length())
diff --git a/chrome/test/automation/tab_proxy.cc b/chrome/test/automation/tab_proxy.cc
index 6f2f9a6..83fee1f 100644
--- a/chrome/test/automation/tab_proxy.cc
+++ b/chrome/test/automation/tab_proxy.cc
@@ -341,7 +341,7 @@ bool TabProxy::ExecuteAndExtractValue(const std::wstring& frame_xpath,
   json.append("]");
 
   JSONStringValueSerializer deserializer(json);
-  *value = deserializer.Deserialize(NULL);
+  *value = deserializer.Deserialize(NULL, NULL);
   return *value != NULL;
 }
 
diff --git a/chrome/test/ui/dom_checker_uitest.cc b/chrome/test/ui/dom_checker_uitest.cc
index f235423..84af7da 100644
--- a/chrome/test/ui/dom_checker_uitest.cc
+++ b/chrome/test/ui/dom_checker_uitest.cc
@@ -164,7 +164,7 @@ class DomCheckerTest : public UITest {
 
     std::string json = WideToUTF8(json_wide);
     JSONStringValueSerializer deserializer(json);
-    scoped_ptr<Value> value(deserializer.Deserialize(NULL));
+    scoped_ptr<Value> value(deserializer.Deserialize(NULL, NULL));
 
     EXPECT_TRUE(value.get());
     if (!value.get())
diff --git a/chrome/test/ui/javascript_test_util.cc b/chrome/test/ui/javascript_test_util.cc
index f2f7f7b..8f07809 100644
--- a/chrome/test/ui/javascript_test_util.cc
+++ b/chrome/test/ui/javascript_test_util.cc
@@ -15,7 +15,7 @@ bool JsonDictionaryToMap(const std::string& json,
                          std::map<std::string, std::string>* results) {
   DCHECK(results != NULL);
   JSONStringValueSerializer deserializer(json);
-  scoped_ptr<Value> root(deserializer.Deserialize(NULL));
+  scoped_ptr<Value> root(deserializer.Deserialize(NULL, NULL));
 
   // Note that we don't use ASSERT_TRUE here (and in some other places) as it
   // doesn't work inside a function with a return type other than void.
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index ff952ba..9ad2aa1 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -706,7 +706,7 @@ static DictionaryValue* LoadDictionaryValueFromPath(const FilePath& path) {
     return NULL;
 
   JSONFileValueSerializer serializer(path);
-  scoped_ptr<Value> root_value(serializer.Deserialize(NULL));
+  scoped_ptr<Value> root_value(serializer.Deserialize(NULL, NULL));
   if (!root_value.get() || root_value->GetType() != Value::TYPE_DICTIONARY)
     return NULL;