summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/autocomplete/search_provider.cc3
-rw-r--r--chrome/browser/bookmarks/bookmark_storage.cc2
-rw-r--r--chrome/browser/extensions/extensions_service.cc2
-rw-r--r--chrome/browser/page_state.cc2
4 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc
index 47ccdd8..0bad51c 100644
--- a/chrome/browser/autocomplete/search_provider.cc
+++ b/chrome/browser/autocomplete/search_provider.cc
@@ -133,7 +133,8 @@ void SearchProvider::OnURLFetchComplete(const URLFetcher* source,
deserializer.set_allow_trailing_comma(true);
Value* root_val = NULL;
have_suggest_results_ = status.is_success() && (response_code == 200) &&
- deserializer.Deserialize(&root_val) && ParseSuggestResults(root_val);
+ deserializer.Deserialize(&root_val, NULL) &&
+ ParseSuggestResults(root_val);
delete root_val;
ConvertResultsToAutocompleteMatches();
listener_->OnProviderUpdate(!suggest_results_.empty());
diff --git a/chrome/browser/bookmarks/bookmark_storage.cc b/chrome/browser/bookmarks/bookmark_storage.cc
index 591f190..e6e9a50 100644
--- a/chrome/browser/bookmarks/bookmark_storage.cc
+++ b/chrome/browser/bookmarks/bookmark_storage.cc
@@ -167,7 +167,7 @@ void BookmarkStorageBackend::Read(scoped_refptr<BookmarkStorage> service,
Value* root = NULL;
if (bookmark_file_exists) {
JSONFileValueSerializer serializer(path);
- serializer.Deserialize(&root);
+ serializer.Deserialize(&root, NULL);
}
// BookmarkStorage takes ownership of root.
diff --git a/chrome/browser/extensions/extensions_service.cc b/chrome/browser/extensions/extensions_service.cc
index 67d508e..32cc861 100644
--- a/chrome/browser/extensions/extensions_service.cc
+++ b/chrome/browser/extensions/extensions_service.cc
@@ -86,7 +86,7 @@ bool ExtensionsServiceBackend::LoadExtensionsFromDirectory(
JSONFileValueSerializer serializer(manifest_path.ToWStringHack());
Value* root = NULL;
- if (!serializer.Deserialize(&root)) {
+ if (!serializer.Deserialize(&root, NULL)) {
ReportExtensionLoadError(frontend.get(),
Extension::kInvalidManifestError);
continue;
diff --git a/chrome/browser/page_state.cc b/chrome/browser/page_state.cc
index e0c350f..f47a4cf 100644
--- a/chrome/browser/page_state.cc
+++ b/chrome/browser/page_state.cc
@@ -42,7 +42,7 @@ void PageState::InitWithBytes(const std::string& bytes) {
JSONStringValueSerializer serializer(bytes);
Value* root = NULL;
- if (!serializer.Deserialize(&root))
+ if (!serializer.Deserialize(&root, NULL))
NOTREACHED();
if (root != NULL && root->GetType() == Value::TYPE_DICTIONARY) {