components/bookmarks/browser/bookmark_storage.cc - Issue 1394993004: Make ValueDeserializer::Deserialize return scoped_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: components/bookmarks/browser/bookmark_storage.cc

Issue 1394993004: Make ValueDeserializer::Deserialize return scoped_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix and add todo about not failed trybot Created 5 years, 2 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 | « components/bookmarks/browser/bookmark_codec_unittest.cc ('k') | components/json_schema/json_schema_validator_unittest_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: components/bookmarks/browser/bookmark_storage.cc

diff --git a/components/bookmarks/browser/bookmark_storage.cc b/components/bookmarks/browser/bookmark_storage.cc

index da721b1288849fdaa95d4cba3f635b0bd71089ae..6f11d069407c439b48325ce1c0fd5b098c8b2775 100644

--- a/components/bookmarks/browser/bookmark_storage.cc

+++ b/components/bookmarks/browser/bookmark_storage.cc

@@ -56,7 +56,7 @@ void LoadCallback(const base::FilePath& path,

bool bookmark_file_exists = base::PathExists(path);

if (bookmark_file_exists) {

JSONFileValueDeserializer deserializer(path);

- scoped_ptr<base::Value> root(deserializer.Deserialize(NULL, NULL));

+ scoped_ptr<base::Value> root = deserializer.Deserialize(NULL, NULL);

if (root.get()) {

// Building the index can take a while, so we do it on the background