detect preferences errors

chrome/browser/automation/automation_provider.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/browser/automation/automation_provider.h"
 
 #include <set>
 
 #include "app/l10n_util.h"
 #include "app/message_box_flags.h"
@@ skipping 1540 matching lines @@
 
   // Basic error checking.
   if (browser_tracker_->ContainsHandle(handle)) {
     browser = browser_tracker_->GetResource(handle);
   }
   if (!browser) {
     error_string = "no browser object";
   } else {
     base::JSONReader reader;
     std::string error;
-    values.reset(reader.ReadAndReturnError(json_request, true, &error));
+    values.reset(reader.ReadAndReturnError(json_request, true, NULL, &error));
     if (!error.empty()) {
       error_string = error;
     }
   }
 
   // Make sure input is a dict with a string command.
   std::string command;
   DictionaryValue* dict_value = NULL;
   if (error_string.empty()) {
     if (values->GetType() != Value::TYPE_DICTIONARY) {
@@ skipping 62 matching lines @@
 }
 
 class SetProxyConfigTask : public Task {
  public:
   SetProxyConfigTask(URLRequestContextGetter* request_context_getter,
                      const std::string& new_proxy_config)
       : request_context_getter_(request_context_getter), proxy_config_(new_proxy_config) {}
   virtual void Run() {
     // First, deserialize the JSON string. If this fails, log and bail.
     JSONStringValueSerializer deserializer(proxy_config_);
-    std::string error_message;
-    scoped_ptr<Value> root(deserializer.Deserialize(&error_message));
+    std::string error_msg;
+    scoped_ptr<Value> root(deserializer.Deserialize(NULL, &error_msg));
     if (!root.get() || root->GetType() != Value::TYPE_DICTIONARY) {
       DLOG(WARNING) << "Received bad JSON string for ProxyConfig: "
-                    << error_message;
+                    << error_msg;
       return;
     }
 
     scoped_ptr<DictionaryValue> dict(
         static_cast<DictionaryValue*>(root.release()));
     // Now put together a proxy configuration from the deserialized string.
     net::ProxyConfig pc;
     PopulateProxyConfig(*dict.get(), &pc);
 
     net::ProxyService* proxy_service =
@@ skipping 1024 matching lines @@
 
 void AutomationProvider::StartTrackingPopupMenus(
     int browser_handle, bool* success) {
   NOTIMPLEMENTED();
 }
 
 void AutomationProvider::WaitForPopupMenuToOpen(IPC::Message* reply_message) {
   NOTIMPLEMENTED();
 }
 #endif  // !defined(TOOLKIT_VIEWS)