chrome/browser/chromeos/login/supervised/supervised_user_authentication.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/chromeos/login/supervised/supervised_user_authentication.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 ::From 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

« chrome/browser/chromeos/app_mode/kiosk_external_updater.cc ('K') | « chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc ('k') | chrome/browser/component_updater/component_installers_unittest.cc » ('j') | chrome/browser/component_updater/recovery_component_installer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/supervised/supervised_user_authentication.cc

diff --git a/chrome/browser/chromeos/login/supervised/supervised_user_authentication.cc b/chrome/browser/chromeos/login/supervised/supervised_user_authentication.cc

index 389dcc5de8a04e8d9321ab68648efaf25d758a04..74856040c8920487340ed91e96a340a85f126cd4 100644

--- a/chrome/browser/chromeos/login/supervised/supervised_user_authentication.cc

+++ b/chrome/browser/chromeos/login/supervised/supervised_user_authentication.cc

@@ -58,8 +58,8 @@ base::DictionaryValue* LoadPasswordData(base::FilePath profile_dir) {

profile_dir.Append(kPasswordUpdateFile));

std::string error_message;

int error_code = JSONFileValueDeserializer::JSON_NO_ERROR;

- scoped_ptr<base::Value> value(

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

+ scoped_ptr<base::Value> value =

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

if (JSONFileValueDeserializer::JSON_NO_ERROR != error_code) {

LOG(ERROR) << "Could not deserialize password data, error = " << error_code

<< " / " << error_message;