Index: content/renderer/render_frame_impl.cc |
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc |
index 6c8ad23375dbcb01b52ab2c6176de2251c9c4413..ec495b9e0488e054be820d3e978b260280385dea 100644 |
--- a/content/renderer/render_frame_impl.cc |
+++ b/content/renderer/render_frame_impl.cc |
@@ -3001,10 +3001,11 @@ blink::WebMediaPlayer* RenderFrameImpl::CreateMediaPlayer( |
return media_player; |
} |
-blink::WebApplicationCacheHost* RenderFrameImpl::CreateApplicationCacheHost( |
+std::unique_ptr<blink::WebApplicationCacheHost> |
+RenderFrameImpl::CreateApplicationCacheHost( |
blink::WebApplicationCacheHostClient* client) { |
if (!frame_ || !frame_->View()) |
- return NULL; |
+ return nullptr; |
DocumentState* document_state = |
frame_->ProvisionalDataSource() |
@@ -3014,7 +3015,7 @@ blink::WebApplicationCacheHost* RenderFrameImpl::CreateApplicationCacheHost( |
NavigationStateImpl* navigation_state = |
static_cast<NavigationStateImpl*>(document_state->navigation_state()); |
- return new RendererWebApplicationCacheHostImpl( |
+ return base::MakeUnique<RendererWebApplicationCacheHostImpl>( |
RenderViewImpl::FromWebView(frame_->View()), client, |
RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy(), |
navigation_state->request_params().appcache_host_id); |
@@ -3087,7 +3088,7 @@ blink::BlameContext* RenderFrameImpl::GetFrameBlameContext() { |
return blame_context_.get(); |
} |
-blink::WebServiceWorkerProvider* |
+std::unique_ptr<blink::WebServiceWorkerProvider> |
RenderFrameImpl::CreateServiceWorkerProvider() { |
// At this point we should have non-null data source. |
DCHECK(frame_->DataSource()); |
@@ -3100,7 +3101,7 @@ RenderFrameImpl::CreateServiceWorkerProvider() { |
// The context can be null when the frame is sandboxed. |
return nullptr; |
} |
- return new WebServiceWorkerProviderImpl( |
+ return base::MakeUnique<WebServiceWorkerProviderImpl>( |
ChildThreadImpl::current()->thread_safe_sender(), provider->context()); |
} |