| 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 da8e258d1ad133a3c7ae014d23046cf2ab663855..aedda404440ede1527e85dba6770df4d95c2c21a 100644
|
| --- a/ui/events/blink/input_handler_proxy_unittest.cc
|
| +++ b/ui/events/blink/input_handler_proxy_unittest.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/macros.h"
|
| #include "base/memory/scoped_ptr.h"
|
| +#include "cc/input/main_thread_scrolling_reason.h"
|
| #include "cc/trees/swap_promise_monitor.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -244,15 +245,15 @@ WebTouchPoint CreateWebTouchPoint(WebTouchPoint::State state, float x,
|
|
|
| const cc::InputHandler::ScrollStatus kImplThreadScrollState(
|
| cc::InputHandler::SCROLL_ON_IMPL_THREAD,
|
| - cc::InputHandler::NOT_SCROLLING_ON_MAIN);
|
| + cc::MainThreadScrollingReason::kNotScrollingOnMain);
|
|
|
| const cc::InputHandler::ScrollStatus kMainThreadScrollState(
|
| cc::InputHandler::SCROLL_ON_MAIN_THREAD,
|
| - cc::InputHandler::EVENT_HANDLERS);
|
| + cc::MainThreadScrollingReason::kEventHandlers);
|
|
|
| const cc::InputHandler::ScrollStatus kScrollIgnoredScrollState(
|
| cc::InputHandler::SCROLL_IGNORED,
|
| - cc::InputHandler::NOT_SCROLLABLE);
|
| + cc::MainThreadScrollingReason::kNotScrollable);
|
|
|
| } // namespace
|
|
|
|
|