detect preferences errors

chrome/installer/util/master_preferences.cc

 // Copyright (c) 2009 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/installer/util/master_preferences.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "chrome/common/json_value_serializer.h"
@@ skipping 151 matching lines @@
   if (!file_util::PathExists(master_prefs_path)) {
     LOG(WARNING) << "Master preferences file not found: "
                  << master_prefs_path.value();
     return NULL;
   }
   std::string json_data;
   if (!file_util::ReadFileToString(master_prefs_path, &json_data))
     return NULL;
 
   JSONStringValueSerializer json(json_data);
-  scoped_ptr<Value> root(json.Deserialize(NULL));
+  scoped_ptr<Value> root(json.Deserialize(NULL, NULL));
 
   if (!root.get())
     return NULL;
 
   if (!root->IsType(Value::TYPE_DICTIONARY))
     return NULL;
 
   return static_cast<DictionaryValue*>(root.release());
 }
 
@@ skipping 10 matching lines @@
   return true;
 }
 
 bool HasExtensionsBlock(const DictionaryValue* prefs,
                         DictionaryValue** extensions) {
   return (prefs->GetDictionary(master_preferences::kExtensionsBlock,
                                extensions));
 }
 
 }  // installer_util