mustash: Use ui::chromeos::EventRewriter in mus

content/browser/web_contents/web_contents_view_aura_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/web_contents/web_contents_view_aura.h"
 
 #include <stddef.h>
 #include <tuple>
 
 #include "base/command_line.h"
@@ skipping 26 matching lines @@
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
 #include "content/public/test/test_renderer_host.h"
 #include "content/public/test/test_utils.h"
 #include "content/shell/browser/shell.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/events/base_event_utils.h"
-#include "ui/events/event_processor.h"
+#include "ui/events/event_sink.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/event_generator.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
 
 namespace {
 
 // TODO(tdresser): Find a way to avoid sleeping like this. See crbug.com/405282
@@ skipping 395 matching lines @@
 
   // Make sure the page has both back/forward history.
   ExecuteSyncJSFunction(main_frame, "navigate_next()");
   EXPECT_EQ(1, GetCurrentIndex());
   ExecuteSyncJSFunction(main_frame, "navigate_next()");
   EXPECT_EQ(2, GetCurrentIndex());
   web_contents->GetController().GoBack();
   EXPECT_EQ(1, GetCurrentIndex());
 
   aura::Window* content = web_contents->GetContentNativeView();
-  ui::EventProcessor* dispatcher = content->GetHost()->event_processor();
+  ui::EventSink* sink = content->GetHost()->event_sink();
   gfx::Rect bounds = content->GetBoundsInRootWindow();
 
   base::TimeTicks timestamp = ui::EventTimeForNow();
   ui::TouchEvent press(
       ui::ET_TOUCH_PRESSED,
       gfx::Point(bounds.x() + bounds.width() / 2, bounds.y() + 5), timestamp,
       ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0));
-  ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&press);
+  ui::EventDispatchDetails details = sink->OnEventFromSource(&press);
   ASSERT_FALSE(details.dispatcher_destroyed);
   EXPECT_EQ(1, GetCurrentIndex());
 
   timestamp += base::TimeDelta::FromMilliseconds(10);
   ui::TouchEvent move1(
       ui::ET_TOUCH_MOVED, gfx::Point(bounds.right() - 10, bounds.y() + 5),
       timestamp,
       ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0));
-  details = dispatcher->OnEventFromSource(&move1);
+  details = sink->OnEventFromSource(&move1);
   ASSERT_FALSE(details.dispatcher_destroyed);
   EXPECT_EQ(1, GetCurrentIndex());
 
   // Swipe back from the right edge, back to the left edge, back to the right
   // edge.
 
   for (int x = bounds.right() - 10; x >= bounds.x() + 10; x-= 10) {
     timestamp += base::TimeDelta::FromMilliseconds(10);
     ui::TouchEvent inc(
         ui::ET_TOUCH_MOVED, gfx::Point(x, bounds.y() + 5), timestamp,
         ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0));
-    details = dispatcher->OnEventFromSource(&inc);
+    details = sink->OnEventFromSource(&inc);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(1, GetCurrentIndex());
   }
 
   for (int x = bounds.x() + 10; x <= bounds.width() - 10; x+= 10) {
     timestamp += base::TimeDelta::FromMilliseconds(10);
     ui::TouchEvent inc(
         ui::ET_TOUCH_MOVED, gfx::Point(x, bounds.y() + 5), timestamp,
         ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0));
-    details = dispatcher->OnEventFromSource(&inc);
+    details = sink->OnEventFromSource(&inc);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(1, GetCurrentIndex());
   }
 
   for (int x = bounds.width() - 10; x >= bounds.x() + 10; x-= 10) {
     timestamp += base::TimeDelta::FromMilliseconds(10);
     ui::TouchEvent inc(
         ui::ET_TOUCH_MOVED, gfx::Point(x, bounds.y() + 5), timestamp,
         ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0));
-    details = dispatcher->OnEventFromSource(&inc);
+    details = sink->OnEventFromSource(&inc);
     ASSERT_FALSE(details.dispatcher_destroyed);
     EXPECT_EQ(1, GetCurrentIndex());
   }
 
   // Do not end the overscroll sequence.
 }
 
 // Tests that the page has has a screenshot when navigation happens:
 //  - from within the page (from a JS function)
 //  - interactively, when user does an overscroll gesture
@@ skipping 467 matching lines @@
       static_cast<WebContentsImpl*>(shell()->web_contents());
   VerticalOverscrollTracker tracker;
   web_contents->SetDelegate(&tracker);
 
   // This test triggers a large number of animations. Speed them up to ensure
   // the test completes within its time limit.
   ui::ScopedAnimationDurationScaleMode fast_duration_mode(
       ui::ScopedAnimationDurationScaleMode::FAST_DURATION);
 
   aura::Window* content = web_contents->GetContentNativeView();
-  ui::EventProcessor* dispatcher = content->GetHost()->event_processor();
+  ui::EventSink* sink = content->GetHost()->event_sink();
   gfx::Rect bounds = content->GetBoundsInRootWindow();
 
   // Overscroll horizontally.
   {
     int kXStep = bounds.width() / 10;
     gfx::Point location(bounds.right() - kXStep, bounds.y() + 5);
     base::TimeTicks timestamp = ui::EventTimeForNow();
     ui::TouchEvent press(
         ui::ET_TOUCH_PRESSED, location, timestamp,
         ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0));
-    ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&press);
+    ui::EventDispatchDetails details = sink->OnEventFromSource(&press);
     ASSERT_FALSE(details.dispatcher_destroyed);
     WaitAFrame();
     location -= gfx::Vector2d(kXStep, 0);
     timestamp += base::TimeDelta::FromMilliseconds(10);
 
     while (location.x() > bounds.x() + kXStep) {
       ui::TouchEvent inc(
           ui::ET_TOUCH_MOVED, location, timestamp,
           ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0));
-      details = dispatcher->OnEventFromSource(&inc);
+      details = sink->OnEventFromSource(&inc);
       ASSERT_FALSE(details.dispatcher_destroyed);
       WaitAFrame();
       location -= gfx::Vector2d(10, 0);
       timestamp += base::TimeDelta::FromMilliseconds(10);
     }
 
     ui::TouchEvent release(
         ui::ET_TOUCH_RELEASED, location, timestamp,
         ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0));
-    details = dispatcher->OnEventFromSource(&release);
+    details = sink->OnEventFromSource(&release);
     ASSERT_FALSE(details.dispatcher_destroyed);
     WaitAFrame();
 
     EXPECT_EQ(0, tracker.num_overscroll_updates());
     EXPECT_FALSE(tracker.overscroll_completed());
   }
 
   // Overscroll vertically.
   {
     tracker.Reset();
 
     int kYStep = bounds.height() / 10;
     gfx::Point location(bounds.x() + 10, bounds.y() + kYStep);
     base::TimeTicks timestamp = ui::EventTimeForNow();
     ui::TouchEvent press(
         ui::ET_TOUCH_PRESSED, location, timestamp,
         ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0));
-    ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&press);
+    ui::EventDispatchDetails details = sink->OnEventFromSource(&press);
     ASSERT_FALSE(details.dispatcher_destroyed);
     WaitAFrame();
     location += gfx::Vector2d(0, kYStep);
     timestamp += base::TimeDelta::FromMilliseconds(10);
 
     while (location.y() < bounds.bottom() - kYStep) {
       ui::TouchEvent inc(
           ui::ET_TOUCH_MOVED, location, timestamp,
           ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0));
-      details = dispatcher->OnEventFromSource(&inc);
+      details = sink->OnEventFromSource(&inc);
       ASSERT_FALSE(details.dispatcher_destroyed);
       WaitAFrame();
       location += gfx::Vector2d(0, kYStep);
       timestamp += base::TimeDelta::FromMilliseconds(10);
     }
 
     ui::TouchEvent release(
         ui::ET_TOUCH_RELEASED, location, timestamp,
         ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0));
-    details = dispatcher->OnEventFromSource(&release);
+    details = sink->OnEventFromSource(&release);
     ASSERT_FALSE(details.dispatcher_destroyed);
     WaitAFrame();
 
     EXPECT_LT(0, tracker.num_overscroll_updates());
     EXPECT_TRUE(tracker.overscroll_completed());
   }
 
   // Start out overscrolling vertically, then switch directions and finish
   // overscrolling horizontally.
   {
     tracker.Reset();
 
     int kXStep = bounds.width() / 10;
     int kYStep = bounds.height() / 10;
     gfx::Point location = bounds.origin() + gfx::Vector2d(0, kYStep);
     base::TimeTicks timestamp = ui::EventTimeForNow();
     ui::TouchEvent press(
         ui::ET_TOUCH_PRESSED, location, timestamp,
         ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0));
-    ui::EventDispatchDetails details = dispatcher->OnEventFromSource(&press);
+    ui::EventDispatchDetails details = sink->OnEventFromSource(&press);
     ASSERT_FALSE(details.dispatcher_destroyed);
     WaitAFrame();
     location += gfx::Vector2d(0, kYStep);
     timestamp += base::TimeDelta::FromMilliseconds(10);
 
     for (size_t i = 0; i < 3; ++i) {
       ui::TouchEvent inc(
           ui::ET_TOUCH_MOVED, location, timestamp,
           ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0));
-      details = dispatcher->OnEventFromSource(&inc);
+      details = sink->OnEventFromSource(&inc);
       ASSERT_FALSE(details.dispatcher_destroyed);
       WaitAFrame();
       location += gfx::Vector2d(0, kYStep);
       timestamp += base::TimeDelta::FromMilliseconds(10);
     }
 
     while (location.x() < bounds.right() - kXStep) {
       ui::TouchEvent inc(
           ui::ET_TOUCH_MOVED, location, timestamp,
           ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0));
-      details = dispatcher->OnEventFromSource(&inc);
+      details = sink->OnEventFromSource(&inc);
       ASSERT_FALSE(details.dispatcher_destroyed);
       WaitAFrame();
       location += gfx::Vector2d(kXStep, 0);
       timestamp += base::TimeDelta::FromMilliseconds(10);
     }
 
     ui::TouchEvent release(
         ui::ET_TOUCH_RELEASED, location, timestamp,
         ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH, 0));
-    details = dispatcher->OnEventFromSource(&release);
+    details = sink->OnEventFromSource(&release);
     ASSERT_FALSE(details.dispatcher_destroyed);
     WaitAFrame();
 
     EXPECT_LT(0, tracker.num_overscroll_updates());
     EXPECT_FALSE(tracker.overscroll_completed());
   }
 }
 
 }  // namespace content