diff options
| author | dcheng <dcheng@chromium.org> | 2015-12-26 12:43:13 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-26 20:44:35 +0000 |
| commit | f63a125013805bf3dd72f90ec33f4d0aa0606660 (patch) | |
| tree | 8ccd1889c5ba6ba51e39cedbd817c5772833bece /content/public/renderer | |
| parent | e13537fe418eff11d3cab9077f6a647d7c74f103 (diff) | |
| download | chromium_src-f63a125013805bf3dd72f90ec33f4d0aa0606660.zip chromium_src-f63a125013805bf3dd72f90ec33f4d0aa0606660.tar.gz chromium_src-f63a125013805bf3dd72f90ec33f4d0aa0606660.tar.bz2 | |
Convert Pass()→std::move() in //content
BUG=557422
R=avi@chromium.org
Review URL: https://codereview.chromium.org/1544293002
Cr-Commit-Position: refs/heads/master@{#366905}
Diffstat (limited to 'content/public/renderer')
| -rw-r--r-- | content/public/renderer/media_stream_api.cc | 6 |
1 files changed, 4 insertions, 2 deletions
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 <utility> + #include "base/base64.h" #include "base/callback.h" #include "base/rand_util.h" @@ -37,7 +39,7 @@ bool AddVideoTrackToMediaStream(scoped_ptr<media::VideoCapturerSource> 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<media::VideoCapturerSource> source, blink::WebMediaStreamSource webkit_source; scoped_ptr<MediaStreamVideoSource> 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()); |