Index: ui/events/blink/input_handler_proxy_unittest.cc |
diff --git a/ui/events/blink/input_handler_proxy_unittest.cc b/ui/events/blink/input_handler_proxy_unittest.cc |
index 5e3239f88a1895b4b6f994e7feb1de792c3a6998..2ef91cd7824aa0e1c2595be34511a41b2f8ed833 100644 |
--- a/ui/events/blink/input_handler_proxy_unittest.cc |
+++ b/ui/events/blink/input_handler_proxy_unittest.cc |
@@ -4,8 +4,9 @@ |
#include "ui/events/blink/input_handler_proxy.h" |
+#include <memory> |
+ |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/test/histogram_tester.h" |
#include "cc/input/main_thread_scrolling_reason.h" |
#include "cc/trees/swap_promise_monitor.h" |
@@ -117,9 +118,9 @@ class MockInputHandler : public cc::InputHandler { |
MOCK_METHOD1(ScrollEnd, void(cc::ScrollState*)); |
MOCK_METHOD0(FlingScrollBegin, cc::InputHandler::ScrollStatus()); |
- scoped_ptr<cc::SwapPromiseMonitor> CreateLatencyInfoSwapPromiseMonitor( |
+ std::unique_ptr<cc::SwapPromiseMonitor> CreateLatencyInfoSwapPromiseMonitor( |
ui::LatencyInfo* latency) override { |
- return scoped_ptr<cc::SwapPromiseMonitor>(); |
+ return std::unique_ptr<cc::SwapPromiseMonitor>(); |
} |
cc::ScrollElasticityHelper* CreateScrollElasticityHelper() override { |
@@ -397,7 +398,7 @@ class InputHandlerProxyTest |
testing::StrictMock<MockInputHandler> mock_input_handler_; |
testing::StrictMock<MockSynchronousInputHandler> |
mock_synchronous_input_handler_; |
- scoped_ptr<TestInputHandlerProxy> input_handler_; |
+ std::unique_ptr<TestInputHandlerProxy> input_handler_; |
testing::StrictMock<MockInputHandlerProxyClient> mock_client_; |
WebGestureEvent gesture_; |
InputHandlerProxy::EventDisposition expected_disposition_; |