Index: content/renderer/input/input_event_filter.h |
diff --git a/content/renderer/input/input_event_filter.h b/content/renderer/input/input_event_filter.h |
index ed93fa4e33bf3f5121cf5ce7b70cdefa5e864c91..6457fb6116ceff1fa2fe81b10fc0632ad08bb7dd 100644 |
--- a/content/renderer/input/input_event_filter.h |
+++ b/content/renderer/input/input_event_filter.h |
@@ -85,8 +85,8 @@ class CONTENT_EXPORT InputEventFilter : public InputHandlerManagerClient, |
~InputEventFilter() override; |
void ForwardToHandler(const IPC::Message& message); |
- void SendMessage(scoped_ptr<IPC::Message> message); |
- void SendMessageOnIOThread(scoped_ptr<IPC::Message> message); |
+ void SendMessage(std::unique_ptr<IPC::Message> message); |
+ void SendMessageOnIOThread(std::unique_ptr<IPC::Message> message); |
scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_; |
base::Callback<void(const IPC::Message&)> main_listener_; |
@@ -106,14 +106,14 @@ class CONTENT_EXPORT InputEventFilter : public InputHandlerManagerClient, |
std::set<int> routes_; |
using RouteQueueMap = |
- std::unordered_map<int, scoped_ptr<MainThreadEventQueue>>; |
+ std::unordered_map<int, std::unique_ptr<MainThreadEventQueue>>; |
RouteQueueMap route_queues_; |
// Used to intercept overscroll notifications while an event is being |
// dispatched. If the event causes overscroll, the overscroll metadata can be |
// bundled in the event ack, saving an IPC. Note that we must continue |
// supporting overscroll IPC notifications due to fling animation updates. |
- scoped_ptr<DidOverscrollParams>* current_overscroll_params_; |
+ std::unique_ptr<DidOverscrollParams>* current_overscroll_params_; |
}; |
} // namespace content |