chrome/browser/prefs/tracked/pref_hash_browsertest.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: chrome/browser/prefs/tracked/pref_hash_browsertest.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 | « chrome/browser/prefs/pref_service_browsertest.cc ('k') | chrome/browser/supervised_user/supervised_user_site_list.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/prefs/tracked/pref_hash_browsertest.cc

diff --git a/chrome/browser/prefs/tracked/pref_hash_browsertest.cc b/chrome/browser/prefs/tracked/pref_hash_browsertest.cc

index 6df10cf793b8c00f80b20981d63f580711a4858a..43cfa0c4360dc3584fe987ada5ace407b2675032 100644

--- a/chrome/browser/prefs/tracked/pref_hash_browsertest.cc

+++ b/chrome/browser/prefs/tracked/pref_hash_browsertest.cc

@@ -88,8 +88,8 @@ scoped_ptr<base::DictionaryValue> ReadPrefsDictionary(

JSONFileValueDeserializer deserializer(pref_file);

int error_code = JSONFileValueDeserializer::JSON_NO_ERROR;

std::string error_str;

- scoped_ptr<base::Value> prefs(

- deserializer.Deserialize(&error_code, &error_str));

+ scoped_ptr<base::Value> prefs =

+ deserializer.Deserialize(&error_code, &error_str);

if (!prefs || error_code != JSONFileValueDeserializer::JSON_NO_ERROR) {

ADD_FAILURE() << "Error #" << error_code << ": " << error_str;

return scoped_ptr<base::DictionaryValue>();

« no previous file with comments | « chrome/browser/prefs/pref_service_browsertest.cc ('k') | chrome/browser/supervised_user/supervised_user_site_list.cc » ('j') | no next file with comments »