remoting/host/cast_extension_session.cc - Issue 609923004: Cleanup usage of scoped_ptr<> in remoting for C++11

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/cast_extension_session.cc

Issue 609923004: Cleanup usage of scoped_ptr<> in remoting for C++11 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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:

Index: remoting/host/cast_extension_session.cc

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

index bff87513b2437052a64fdba7b2d9cadf6212a2a8..76baa85f9507a32badfa8438a2d5c054422dfb65 100644

--- a/remoting/host/cast_extension_session.cc

+++ b/remoting/host/cast_extension_session.cc

@@ -185,11 +185,9 @@ scoped_ptr<CastExtensionSession> CastExtensionSession::Create(

network_settings,

client_session_control,

client_stub));

- if (!cast_extension_session->WrapTasksAndSave()) {

- return scoped_ptr<CastExtensionSession>();

- }

- if (!cast_extension_session->InitializePeerConnection()) {

- return scoped_ptr<CastExtensionSession>();

+ if (!cast_extension_session->WrapTasksAndSave() ||

+ !cast_extension_session->InitializePeerConnection()) {

+ return nullptr;

}

return cast_extension_session.Pass();

}