| Index: content/browser/devtools/render_frame_devtools_agent_host.cc
|
| diff --git a/content/browser/devtools/render_frame_devtools_agent_host.cc b/content/browser/devtools/render_frame_devtools_agent_host.cc
|
| index eb271966dcf49c4b308e9fb04b42a4cb10b071f4..b30463c36ab73845ca150c5bcccd3f813342c2a7 100644
|
| --- a/content/browser/devtools/render_frame_devtools_agent_host.cc
|
| +++ b/content/browser/devtools/render_frame_devtools_agent_host.cc
|
| @@ -4,6 +4,8 @@
|
|
|
| #include "content/browser/devtools/render_frame_devtools_agent_host.h"
|
|
|
| +#include <utility>
|
| +
|
| #include "base/lazy_instance.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "build/build_config.h"
|
| @@ -403,7 +405,7 @@ void RenderFrameDevToolsAgentHost::CommitPending() {
|
| return;
|
| }
|
|
|
| - current_ = pending_.Pass();
|
| + current_ = std::move(pending_);
|
| UpdateProtocolHandlers(current_->host());
|
| current_->Resume();
|
| }
|
| @@ -758,7 +760,7 @@ void RenderFrameDevToolsAgentHost::DisconnectWebContents() {
|
| if (pending_)
|
| DiscardPending();
|
| UpdateProtocolHandlers(nullptr);
|
| - disconnected_ = current_.Pass();
|
| + disconnected_ = std::move(current_);
|
| disconnected_->Detach();
|
| frame_tree_node_ = nullptr;
|
| in_navigation_protocol_message_buffer_.clear();
|
| @@ -774,7 +776,7 @@ void RenderFrameDevToolsAgentHost::ConnectWebContents(WebContents* wc) {
|
| static_cast<RenderFrameHostImpl*>(wc->GetMainFrame());
|
| DCHECK(host);
|
| frame_tree_node_ = host->frame_tree_node();
|
| - current_ = disconnected_.Pass();
|
| + current_ = std::move(disconnected_);
|
| SetPending(host);
|
| CommitPending();
|
| WebContentsObserver::Observe(WebContents::FromRenderFrameHost(host));
|
|
|