Index: content/browser/renderer_host/input/input_router_impl.cc |
diff --git a/content/browser/renderer_host/input/input_router_impl.cc b/content/browser/renderer_host/input/input_router_impl.cc |
index d88634d3d4ae488bb09b144d84cd19ba062c997e..dcae7142ff791c9211c532efc3b35e54d31d0fee 100644 |
--- a/content/browser/renderer_host/input/input_router_impl.cc |
+++ b/content/browser/renderer_host/input/input_router_impl.cc |
@@ -5,6 +5,7 @@ |
#include "content/browser/renderer_host/input/input_router_impl.h" |
#include <math.h> |
+#include <utility> |
#include "base/auto_reset.h" |
#include "base/command_line.h" |
@@ -96,9 +97,9 @@ bool InputRouterImpl::SendInput(scoped_ptr<IPC::Message> message) { |
// Check for types that require an ACK. |
case InputMsg_SelectRange::ID: |
case InputMsg_MoveRangeSelectionExtent::ID: |
- return SendSelectMessage(message.Pass()); |
+ return SendSelectMessage(std::move(message)); |
case InputMsg_MoveCaret::ID: |
- return SendMoveCaret(message.Pass()); |
+ return SendMoveCaret(std::move(message)); |
case InputMsg_HandleInputEvent::ID: |
NOTREACHED() << "WebInputEvents should never be sent via SendInput."; |
return false; |
@@ -328,7 +329,7 @@ bool InputRouterImpl::SendSelectMessage( |
bool InputRouterImpl::SendMoveCaret(scoped_ptr<IPC::Message> message) { |
DCHECK(message->type() == InputMsg_MoveCaret::ID); |
if (move_caret_pending_) { |
- next_move_caret_ = message.Pass(); |
+ next_move_caret_ = std::move(message); |
return true; |
} |
@@ -460,7 +461,7 @@ void InputRouterImpl::OnDidOverscroll(const DidOverscrollParams& params) { |
void InputRouterImpl::OnMsgMoveCaretAck() { |
move_caret_pending_ = false; |
if (next_move_caret_) |
- SendMoveCaret(next_move_caret_.Pass()); |
+ SendMoveCaret(std::move(next_move_caret_)); |
} |
void InputRouterImpl::OnSelectMessageAck() { |
@@ -470,7 +471,7 @@ void InputRouterImpl::OnSelectMessageAck() { |
make_scoped_ptr(pending_select_messages_.front()); |
pending_select_messages_.pop_front(); |
- SendSelectMessage(next_message.Pass()); |
+ SendSelectMessage(std::move(next_message)); |
} |
} |
@@ -585,8 +586,8 @@ void InputRouterImpl::ProcessMouseAck(blink::WebInputEvent::Type type, |
if (next_mouse_move_) { |
DCHECK(next_mouse_move_->event.type == WebInputEvent::MouseMove); |
- scoped_ptr<MouseEventWithLatencyInfo> next_mouse_move |
- = next_mouse_move_.Pass(); |
+ scoped_ptr<MouseEventWithLatencyInfo> next_mouse_move = |
+ std::move(next_mouse_move_); |
SendMouseEvent(*next_mouse_move); |
} |
} |