From f63a125013805bf3dd72f90ec33f4d0aa0606660 Mon Sep 17 00:00:00 2001 From: dcheng Date: Sat, 26 Dec 2015 12:43:13 -0800 Subject: =?UTF-8?q?Convert=20Pass()=E2=86=92std::move()=20in=20//content?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG=557422 R=avi@chromium.org Review URL: https://codereview.chromium.org/1544293002 Cr-Commit-Position: refs/heads/master@{#366905} --- content/public/renderer/media_stream_api.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'content/public/renderer') diff --git a/content/public/renderer/media_stream_api.cc b/content/public/renderer/media_stream_api.cc index 5908c99..9ec76b7 100644 --- a/content/public/renderer/media_stream_api.cc +++ b/content/public/renderer/media_stream_api.cc @@ -4,6 +4,8 @@ #include "content/public/renderer/media_stream_api.h" +#include + #include "base/base64.h" #include "base/callback.h" #include "base/rand_util.h" @@ -37,7 +39,7 @@ bool AddVideoTrackToMediaStream(scoped_ptr source, blink::WebMediaStream web_stream = blink::WebMediaStreamRegistry::lookupMediaStreamDescriptor( GURL(media_stream_url)); - return AddVideoTrackToMediaStream(source.Pass(), is_remote, is_readonly, + return AddVideoTrackToMediaStream(std::move(source), is_remote, is_readonly, &web_stream); } @@ -53,7 +55,7 @@ bool AddVideoTrackToMediaStream(scoped_ptr source, blink::WebMediaStreamSource webkit_source; scoped_ptr media_stream_source( new MediaStreamVideoCapturerSource( - MediaStreamSource::SourceStoppedCallback(), source.Pass())); + MediaStreamSource::SourceStoppedCallback(), std::move(source))); webkit_source.initialize(track_id, blink::WebMediaStreamSource::TypeVideo, track_id, is_remote, is_readonly); webkit_source.setExtraData(media_stream_source.get()); -- cgit v1.1