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

Unified Diff: content/browser/renderer_host/websocket_host.cc

Issue 1545243002: Convert Pass()→std::move() in //content/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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/browser/renderer_host/websocket_host.cc
diff --git a/content/browser/renderer_host/websocket_host.cc b/content/browser/renderer_host/websocket_host.cc
index f032282f843fb6d2289688238d52d509d6d9fa80..5551e9643bf2de32a906f1558bdfdcd88d5ab1bb 100644
--- a/content/browser/renderer_host/websocket_host.cc
+++ b/content/browser/renderer_host/websocket_host.cc
@@ -4,6 +4,8 @@
#include "content/browser/renderer_host/websocket_host.h"
+#include <utility>
+
#include "base/location.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
@@ -274,7 +276,7 @@ ChannelState WebSocketEventHandler::OnSSLCertificateError(
<< " routing_id=" << routing_id_ << " url=" << url.spec()
<< " cert_status=" << ssl_info.cert_status << " fatal=" << fatal;
ssl_error_handler_delegate_.reset(
- new SSLErrorHandlerDelegate(callbacks.Pass()));
+ new SSLErrorHandlerDelegate(std::move(callbacks)));
SSLManager::OnSSLCertificateSubresourceError(
ssl_error_handler_delegate_->GetWeakPtr(), url,
dispatcher_->render_process_id(), render_frame_id_, ssl_info, fatal);
@@ -284,7 +286,7 @@ ChannelState WebSocketEventHandler::OnSSLCertificateError(
WebSocketEventHandler::SSLErrorHandlerDelegate::SSLErrorHandlerDelegate(
scoped_ptr<net::WebSocketEventInterface::SSLErrorCallbacks> callbacks)
- : callbacks_(callbacks.Pass()), weak_ptr_factory_(this) {}
+ : callbacks_(std::move(callbacks)), weak_ptr_factory_(this) {}
WebSocketEventHandler::SSLErrorHandlerDelegate::~SSLErrorHandlerDelegate() {}
@@ -382,8 +384,8 @@ void WebSocketHost::AddChannel(
scoped_ptr<net::WebSocketEventInterface> event_interface(
new WebSocketEventHandler(dispatcher_, routing_id_, render_frame_id));
- channel_.reset(
- new net::WebSocketChannel(event_interface.Pass(), url_request_context_));
+ channel_.reset(new net::WebSocketChannel(std::move(event_interface),
+ url_request_context_));
if (pending_flow_control_quota_ > 0) {
// channel_->SendFlowControl(pending_flow_control_quota_) must be called

Powered by Google App Engine
This is Rietveld 408576698