detect preferences errors

chrome/test/automation/javascript_execution_controller.cc

 // Copyright (c) 2010 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/test/automation/javascript_execution_controller.h"
 
 #include "base/json/string_escape.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/json_value_serializer.h"
@@ skipping 54 matching lines @@
       "domAutomation.evaluateJavaScript(";
   script.append(GetDoubleQuotedJson(UTF8ToUTF16(original_script)));
   script.append(");");
   return ExecuteJavaScriptAndGetJSON(script, json);
 }
 
 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())
       LOG(ERROR) << "Cannot parse JSON response: " << parsing_error;
     else
       LOG(ERROR) << "JSON response is empty";
     return false;
   }
 
   // The response must be a list of 3 components:
@@ skipping 32 matching lines @@
 
 bool JavaScriptExecutionController::ConvertResponse(Value* value,
                                                     int* result) {
   return value->GetAsInteger(result);
 }
 
 bool JavaScriptExecutionController::ConvertResponse(Value* value,
                                                     std::string* result) {
   return value->GetAsString(result);
 }