| Index: content/browser/frame_host/render_frame_proxy_host.cc
|
| diff --git a/content/browser/frame_host/render_frame_proxy_host.cc b/content/browser/frame_host/render_frame_proxy_host.cc
|
| index ac53e5ac11f160a9b82fea58a93b7a4cd5842d7e..49bcfc9093a7b05aacb769e20374a84c02cd980d 100644
|
| --- a/content/browser/frame_host/render_frame_proxy_host.cc
|
| +++ b/content/browser/frame_host/render_frame_proxy_host.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "content/browser/frame_host/render_frame_proxy_host.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/lazy_instance.h"
|
| #include "content/browser/bad_message.h"
|
| #include "content/browser/frame_host/cross_process_frame_connector.h"
|
| @@ -122,13 +124,13 @@ RenderWidgetHostView* RenderFrameProxyHost::GetRenderWidgetHostView() {
|
| void RenderFrameProxyHost::TakeFrameHostOwnership(
|
| scoped_ptr<RenderFrameHostImpl> render_frame_host) {
|
| CHECK(render_frame_host_ == nullptr);
|
| - render_frame_host_ = render_frame_host.Pass();
|
| + render_frame_host_ = std::move(render_frame_host);
|
| render_frame_host_->set_render_frame_proxy_host(this);
|
| }
|
|
|
| scoped_ptr<RenderFrameHostImpl> RenderFrameProxyHost::PassFrameHostOwnership() {
|
| render_frame_host_->set_render_frame_proxy_host(NULL);
|
| - return render_frame_host_.Pass();
|
| + return std::move(render_frame_host_);
|
| }
|
|
|
| bool RenderFrameProxyHost::Send(IPC::Message *msg) {
|
|
|