| Index: content/renderer/render_frame_proxy.cc
|
| diff --git a/content/renderer/render_frame_proxy.cc b/content/renderer/render_frame_proxy.cc
|
| index 37b7059f28999473331db3f1d2b5dd844966f029..d9019937a00a6c1ed8950c2f2078737871bd2de4 100644
|
| --- a/content/renderer/render_frame_proxy.cc
|
| +++ b/content/renderer/render_frame_proxy.cc
|
| @@ -52,7 +52,7 @@ RenderFrameProxy* RenderFrameProxy::CreateProxyToReplaceFrame(
|
| blink::WebTreeScopeType scope) {
|
| CHECK_NE(routing_id, MSG_ROUTING_NONE);
|
|
|
| - scoped_ptr<RenderFrameProxy> proxy(
|
| + std::unique_ptr<RenderFrameProxy> proxy(
|
| new RenderFrameProxy(routing_id, frame_to_replace->GetRoutingID()));
|
|
|
| // When a RenderFrame is replaced by a RenderProxy, the WebRemoteFrame should
|
| @@ -94,7 +94,7 @@ RenderFrameProxy* RenderFrameProxy::CreateFrameProxy(
|
| blink::WebFrame* opener =
|
| RenderFrameImpl::ResolveOpener(opener_routing_id, nullptr);
|
|
|
| - scoped_ptr<RenderFrameProxy> proxy(
|
| + std::unique_ptr<RenderFrameProxy> proxy(
|
| new RenderFrameProxy(routing_id, MSG_ROUTING_NONE));
|
| RenderViewImpl* render_view = nullptr;
|
| RenderWidget* render_widget = nullptr;
|
|
|