remoting/host/pairing_registry_delegate_win.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: remoting/host/pairing_registry_delegate_win.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

« extensions/common/extension_l10n_util.cc ('K') | « remoting/host/pairing_registry_delegate_linux.cc ('k') | rlz/chromeos/lib/rlz_value_store_chromeos.cc » ('j') | ui/app_list/search/dictionary_data_store.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: remoting/host/pairing_registry_delegate_win.cc

diff --git a/remoting/host/pairing_registry_delegate_win.cc b/remoting/host/pairing_registry_delegate_win.cc

index a714e31c38432388ce74c846f9a2d71dd45404cd..90b04ba771b21076f04ae6b484e6386cb149acc1 100644

--- a/remoting/host/pairing_registry_delegate_win.cc

+++ b/remoting/host/pairing_registry_delegate_win.cc

@@ -52,8 +52,8 @@ scoped_ptr<base::DictionaryValue> ReadValue(const base::win::RegKey& key,

JSONStringValueDeserializer deserializer(value_json_utf8);

int error_code;

std::string error_message;

- scoped_ptr<base::Value> value(deserializer.Deserialize(&error_code,

- &error_message));

+ scoped_ptr<base::Value> value =

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

if (!value) {

LOG(ERROR) << "Failed to parse '" << value_name << "': " << error_message

<< " (" << error_code << ").";