Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(457)

Unified Diff: chrome/common/extensions/extension_unpacker.cc

Issue 1120006: detect preferences errors (Closed)
Patch Set: changes from review Created 10 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/common/extensions/extension_unittest.cc ('k') | chrome/common/json_value_serializer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/common/extensions/extension_unpacker.cc
diff --git a/chrome/common/extensions/extension_unpacker.cc b/chrome/common/extensions/extension_unpacker.cc
index 8e5e6b611ff1cf003fa7a81f31bad35080eea95a..b6d1d80728d1d99c41a7560c7599e325f96e590a 100644
--- a/chrome/common/extensions/extension_unpacker.cc
+++ b/chrome/common/extensions/extension_unpacker.cc
@@ -101,7 +101,7 @@ DictionaryValue* ExtensionUnpacker::ReadManifest() {
JSONFileValueSerializer serializer(manifest_path);
std::string error;
- scoped_ptr<Value> root(serializer.Deserialize(&error));
+ scoped_ptr<Value> root(serializer.Deserialize(NULL, &error));
if (!root.get()) {
SetError(error);
return NULL;
@@ -276,7 +276,7 @@ bool ExtensionUnpacker::ReadMessageCatalog(const FilePath& message_path) {
std::string error;
JSONFileValueSerializer serializer(message_path);
scoped_ptr<DictionaryValue> root(
- static_cast<DictionaryValue*>(serializer.Deserialize(&error)));
+ static_cast<DictionaryValue*>(serializer.Deserialize(NULL, &error)));
if (!root.get()) {
std::string messages_file = WideToASCII(message_path.ToWStringHack());
if (error.empty()) {
« no previous file with comments | « chrome/common/extensions/extension_unittest.cc ('k') | chrome/common/json_value_serializer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698