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

Unified Diff: content/renderer/pepper/resource_converter.cc

Issue 1873783003: Convert //content/renderer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
Index: content/renderer/pepper/resource_converter.cc
diff --git a/content/renderer/pepper/resource_converter.cc b/content/renderer/pepper/resource_converter.cc
index 741e6c62f0c4d78a7cf2ee6946d080f0568658dc..45687c3fdaf7a97f4906fc414137d7196f1e954c 100644
--- a/content/renderer/pepper/resource_converter.cc
+++ b/content/renderer/pepper/resource_converter.cc
@@ -91,8 +91,8 @@ bool DOMFileSystemToResource(
RendererPpapiHost* host,
const blink::WebDOMFileSystem& dom_file_system,
int* pending_renderer_id,
- scoped_ptr<IPC::Message>* create_message,
- scoped_ptr<IPC::Message>* browser_host_create_message) {
+ std::unique_ptr<IPC::Message>* create_message,
+ std::unique_ptr<IPC::Message>* browser_host_create_message) {
DCHECK(!dom_file_system.isNull());
PP_FileSystemType file_system_type =
@@ -108,7 +108,7 @@ bool DOMFileSystemToResource(
}
*pending_renderer_id = host->GetPpapiHost()->AddPendingResourceHost(
- scoped_ptr<ppapi::host::ResourceHost>(new PepperFileSystemHost(
+ std::unique_ptr<ppapi::host::ResourceHost>(new PepperFileSystemHost(
host, instance, 0, root_url, file_system_type)));
if (*pending_renderer_id == 0)
return false;
@@ -163,7 +163,7 @@ bool DOMMediaStreamTrackToResource(
RendererPpapiHost* host,
const blink::WebDOMMediaStreamTrack& dom_media_stream_track,
int* pending_renderer_id,
- scoped_ptr<IPC::Message>* create_message) {
+ std::unique_ptr<IPC::Message>* create_message) {
DCHECK(!dom_media_stream_track.isNull());
*pending_renderer_id = 0;
#if defined(ENABLE_WEBRTC)
@@ -172,7 +172,7 @@ bool DOMMediaStreamTrackToResource(
if (track.source().getType() == blink::WebMediaStreamSource::TypeVideo) {
*pending_renderer_id = host->GetPpapiHost()->AddPendingResourceHost(
- scoped_ptr<ppapi::host::ResourceHost>(
+ std::unique_ptr<ppapi::host::ResourceHost>(
new PepperMediaStreamVideoTrackHost(host, instance, 0, track)));
if (*pending_renderer_id == 0)
return false;
@@ -183,7 +183,7 @@ bool DOMMediaStreamTrackToResource(
} else if (track.source().getType() ==
blink::WebMediaStreamSource::TypeAudio) {
*pending_renderer_id = host->GetPpapiHost()->AddPendingResourceHost(
- scoped_ptr<ppapi::host::ResourceHost>(
+ std::unique_ptr<ppapi::host::ResourceHost>(
new PepperMediaStreamAudioTrackHost(host, instance, 0, track)));
if (*pending_renderer_id == 0)
return false;
@@ -223,8 +223,8 @@ bool ResourceConverterImpl::FromV8Value(v8::Local<v8::Object> val,
blink::WebDOMFileSystem::fromV8Value(val);
if (!dom_file_system.isNull()) {
int pending_renderer_id;
- scoped_ptr<IPC::Message> create_message;
- scoped_ptr<IPC::Message> browser_host_create_message;
+ std::unique_ptr<IPC::Message> create_message;
+ std::unique_ptr<IPC::Message> browser_host_create_message;
if (!DOMFileSystemToResource(instance_,
host,
dom_file_system,
@@ -247,7 +247,7 @@ bool ResourceConverterImpl::FromV8Value(v8::Local<v8::Object> val,
blink::WebDOMMediaStreamTrack::fromV8Value(val);
if (!dom_media_stream_track.isNull()) {
int pending_renderer_id;
- scoped_ptr<IPC::Message> create_message;
+ std::unique_ptr<IPC::Message> create_message;
if (!DOMMediaStreamTrackToResource(instance_,
host,
dom_media_stream_track,
« no previous file with comments | « content/renderer/pepper/renderer_ppapi_host_impl.cc ('k') | content/renderer/pepper/url_response_info_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698