chrome/browser/chromeos/app_mode/startup_app_launcher.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/app_mode/startup_app_launcher.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/chromeos/app_mode/kiosk_external_updater.cc ('k') | chrome/browser/chromeos/extensions/default_app_order.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/app_mode/startup_app_launcher.cc

diff --git a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc

index 512aa214a35431b290b63ff880b20adeaa5db583..61e125b2ec7495e523ac359e4a812ab4c2a16eb5 100644

--- a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc

+++ b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc

@@ -132,8 +132,8 @@ void StartupAppLauncher::LoadOAuthFileOnBlockingPool(

base::FilePath auth_file = user_data_dir.Append(kOAuthFileName);

scoped_ptr<JSONFileValueDeserializer> deserializer(

new JSONFileValueDeserializer(user_data_dir.Append(kOAuthFileName)));

- scoped_ptr<base::Value> value(

- deserializer->Deserialize(&error_code, &error_msg));

+ scoped_ptr<base::Value> value =

+ deserializer->Deserialize(&error_code, &error_msg);

base::DictionaryValue* dict = NULL;

if (error_code != JSONFileValueDeserializer::JSON_NO_ERROR ||

!value.get() || !value->GetAsDictionary(&dict)) {