chrome/browser/chromeos/extensions/default_app_order.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/extensions/default_app_order.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/app_mode/startup_app_launcher.cc ('k') | chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc » ('j') | chrome/browser/component_updater/recovery_component_installer.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/extensions/default_app_order.cc

diff --git a/chrome/browser/chromeos/extensions/default_app_order.cc b/chrome/browser/chromeos/extensions/default_app_order.cc

index 4abcbaa09172fc2eba0d41e62c8f37017d27cb42..24bcdff3976a58e7b2003e724c28a0b077917988 100644

--- a/chrome/browser/chromeos/extensions/default_app_order.cc

+++ b/chrome/browser/chromeos/extensions/default_app_order.cc

@@ -65,7 +65,7 @@ base::ListValue* ReadExternalOrdinalFile(const base::FilePath& path) {

JSONFileValueDeserializer deserializer(path);

std::string error_msg;

- base::Value* value = deserializer.Deserialize(NULL, &error_msg);

+ base::Value* value = deserializer.Deserialize(NULL, &error_msg).release();

if (!value) {

LOG(WARNING) << "Unable to deserialize default app ordinals json data:"

<< error_msg << ", file=" << path.value();

@@ -77,6 +77,7 @@ base::ListValue* ReadExternalOrdinalFile(const base::FilePath& path) {

return ordinal_list_value;

LOG(WARNING) << "Expect a JSON list in file " << path.value();

+ // TODO(Olli Raula) possible memoryleak http://crbug.com/543015

return NULL;

}