summaryrefslogtreecommitdiff
path: root/chromium/ui/aura/window_tree_host_unittest.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2018-03-08 13:07:32 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2018-03-08 13:40:10 +0000
commit818d9aed569afd192f6d4f6d9b28b72912df8b93 (patch)
treefa30cbdffa3e8fdc09dbbe37ffc0a721b40fced1 /chromium/ui/aura/window_tree_host_unittest.cc
parent66a2147d838e293f4a5db7711c8eba4e6faaaf0f (diff)
downloadqtwebengine-chromium-818d9aed569afd192f6d4f6d9b28b72912df8b93.tar.gz
BASELINE: Update Chromium to 65.0.3325.151
Change-Id: I3c71dd500483eb29491ac3eee4123714dda52da9 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/ui/aura/window_tree_host_unittest.cc')
-rw-r--r--chromium/ui/aura/window_tree_host_unittest.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chromium/ui/aura/window_tree_host_unittest.cc b/chromium/ui/aura/window_tree_host_unittest.cc
index e1ee4cbcc0b..6dbddb67770 100644
--- a/chromium/ui/aura/window_tree_host_unittest.cc
+++ b/chromium/ui/aura/window_tree_host_unittest.cc
@@ -77,6 +77,7 @@ TEST_F(WindowTreeHostTest, DPIWindowSize) {
host()->compositor()->root_layer()->subpixel_position_offset());
}
+#if defined(OS_CHROMEOS)
TEST_F(WindowTreeHostTest, HoldPointerMovesOnChildResizing) {
aura::WindowEventDispatcher* dispatcher = host()->dispatcher();
@@ -98,6 +99,7 @@ TEST_F(WindowTreeHostTest, HoldPointerMovesOnChildResizing) {
// Pointer moves should be routed normally after commit.
EXPECT_FALSE(dispatcher_api.HoldingPointerMoves());
}
+#endif
TEST_F(WindowTreeHostTest, NoRewritesPostIME) {
CounterEventRewriter event_rewriter;