Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1183)

Unified Diff: content/public/renderer/media_stream_utils.cc

Issue 1874903002: Convert //content from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix indent Created 4 years, 8 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
« no previous file with comments | « content/public/renderer/media_stream_utils.h ('k') | content/public/renderer/plugin_instance_throttler.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/renderer/media_stream_utils.cc
diff --git a/content/public/renderer/media_stream_utils.cc b/content/public/renderer/media_stream_utils.cc
index 5b91b182531ba31585bba93627838e2b6c07be9c..8ba74a401b41320a6370afd2ea38ea567d10979b 100644
--- a/content/public/renderer/media_stream_utils.cc
+++ b/content/public/renderer/media_stream_utils.cc
@@ -4,11 +4,11 @@
#include "content/public/renderer/media_stream_utils.h"
+#include <memory>
#include <utility>
#include "base/callback.h"
#include "base/guid.h"
-#include "base/memory/scoped_ptr.h"
#include "base/rand_util.h"
#include "base/strings/utf_string_conversions.h"
#include "content/renderer/media/media_stream_audio_source.h"
@@ -25,7 +25,7 @@
namespace content {
bool AddVideoTrackToMediaStream(
- scoped_ptr<media::VideoCapturerSource> video_source,
+ std::unique_ptr<media::VideoCapturerSource> video_source,
bool is_remote,
bool is_readonly,
blink::WebMediaStream* web_media_stream) {
@@ -94,7 +94,7 @@ bool AddAudioTrackToMediaStream(
// TODO(miu): In an upcoming change, a source purposed for passing audio
// directly (i.e., without modification) will replace this "hacky" use of
// WebRtcAudioCapturer. http://crbug.com/577881
- scoped_ptr<WebRtcAudioCapturer> capturer(
+ std::unique_ptr<WebRtcAudioCapturer> capturer(
WebRtcAudioCapturer::CreateCapturer(-1, StreamDeviceInfo(), constraints,
nullptr, media_stream_source));
capturer->SetCapturerSource(std::move(audio_source), params);
« no previous file with comments | « content/public/renderer/media_stream_utils.h ('k') | content/public/renderer/plugin_instance_throttler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698