Block internal PlatformEvents before they are dispatched in touchview.

ash/wm/maximize_mode/maximize_mode_controller_unittest.cc

Index: ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
diff --git a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
index e9d925d729a7d322a761b1709079e1d4b82c07ef..6fa20b72f39de7419ff8b42643900452926d91db 100644
--- a/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
+++ b/ash/wm/maximize_mode/maximize_mode_controller_unittest.cc
@@ -14,10 +14,7 @@
 #include "ash/test/test_screenshot_delegate.h"
 #include "ash/test/test_system_tray_delegate.h"
 #include "ash/test/test_volume_control_delegate.h"
-#include "ash/wm/maximize_mode/internal_input_device_list.h"
-#include "ash/wm/maximize_mode/maximize_mode_event_blocker.h"
 #include "ui/aura/test/event_generator.h"
-#include "ui/events/event_handler.h"
 #include "ui/gfx/vector3d_f.h"
 #include "ui/message_center/message_center.h"
 
@@ -27,54 +24,6 @@ namespace {
 
 const float kDegreesToRadians = 3.14159265f / 180.0f;
 
-// Filter to count the number of events seen.
-class EventCounter : public ui::EventHandler {
- public:
-  EventCounter();
-  virtual ~EventCounter();
-
-  // Overridden from ui::EventHandler:
-  virtual void OnEvent(ui::Event* event) OVERRIDE;
-
-  void reset() {
-    event_count_ = 0;
-  }
-
-  size_t event_count() const { return event_count_; }
-
- private:
-  size_t event_count_;
-
-  DISALLOW_COPY_AND_ASSIGN(EventCounter);
-};
-
-EventCounter::EventCounter() : event_count_(0) {
-  Shell::GetInstance()->AddPreTargetHandler(this);
-}
-
-EventCounter::~EventCounter() {
-  Shell::GetInstance()->RemovePreTargetHandler(this);
-}
-
-void EventCounter::OnEvent(ui::Event* event) {
-  event_count_++;
-}
-
-// A test internal input device list which pretends that all events are from
-// internal devices to allow verifying that the event blocking works.
-class TestInternalInputDeviceList : public InternalInputDeviceList {
- public:
-  TestInternalInputDeviceList() {}
-  virtual ~TestInternalInputDeviceList() {}
-
-  virtual bool IsEventFromInternalDevice(const ui::Event* event) OVERRIDE {
-    return true;
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(TestInternalInputDeviceList);
-};
-
 }  // namespace
 
 // Test accelerometer data taken with the lid at less than 180 degrees while
@@ -126,13 +75,6 @@ class MaximizeModeControllerTest : public test::AshTestBase {
     return Shell::GetInstance()->IsMaximizeModeWindowManagerEnabled();
   }
 
-  // Overrides the internal input device list for the current event targeters
-  // with one which always returns true.
-  void InstallTestInternalDeviceList() {
-    maximize_mode_controller()->event_blocker_->internal_devices_.reset(
-        new TestInternalInputDeviceList);
-  }
-
   gfx::Display::Rotation GetInternalDisplayRotation() const {
     return Shell::GetInstance()->display_manager()->GetDisplayInfo(
         gfx::Display::InternalDisplayId()).rotation();
@@ -316,78 +258,6 @@ TEST_F(MaximizeModeControllerTest, RotationOnlyInMaximizeMode) {
   EXPECT_EQ(gfx::Display::ROTATE_0, GetInternalDisplayRotation());
 }
 
-// Tests that maximize mode blocks keyboard and mouse events but not touch
-// events.
-TEST_F(MaximizeModeControllerTest, BlocksKeyboardAndMouse) {
-  aura::Window* root = Shell::GetPrimaryRootWindow();
-  aura::test::EventGenerator event_generator(root, root);
-  EventCounter counter;
-
-  event_generator.PressKey(ui::VKEY_ESCAPE, 0);
-  event_generator.ReleaseKey(ui::VKEY_ESCAPE, 0);
-  EXPECT_GT(counter.event_count(), 0u);
-  counter.reset();
-
-  event_generator.ClickLeftButton();
-  EXPECT_GT(counter.event_count(), 0u);
-  counter.reset();
-
-  event_generator.ScrollSequence(
-      gfx::Point(), base::TimeDelta::FromMilliseconds(5), 0, 100, 5, 2);
-  EXPECT_GT(counter.event_count(), 0u);
-  counter.reset();
-
-  event_generator.MoveMouseWheel(0, 10);
-  EXPECT_GT(counter.event_count(), 0u);
-  counter.reset();
-
-  event_generator.PressTouch();
-  event_generator.ReleaseTouch();
-  EXPECT_GT(counter.event_count(), 0u);
-  counter.reset();
-
-  // Open up 270 degrees.
-  TriggerAccelerometerUpdate(gfx::Vector3dF(0.0f, 0.0f, 1.0f),
-                             gfx::Vector3dF(1.0f, 0.0f, 0.0f));
-  ASSERT_TRUE(IsMaximizeModeStarted());
-  InstallTestInternalDeviceList();
-
-  event_generator.PressKey(ui::VKEY_ESCAPE, 0);
-  event_generator.ReleaseKey(ui::VKEY_ESCAPE, 0);
-  EXPECT_EQ(0u, counter.event_count());
-  counter.reset();
-
-  event_generator.ClickLeftButton();
-  EXPECT_EQ(0u, counter.event_count());
-  counter.reset();
-
-  event_generator.ScrollSequence(
-      gfx::Point(), base::TimeDelta::FromMilliseconds(5), 0, 100, 5, 2);
-  EXPECT_EQ(0u, counter.event_count());
-  counter.reset();
-
-  event_generator.MoveMouseWheel(0, 10);
-  EXPECT_EQ(0u, counter.event_count());
-  counter.reset();
-
-  // Touch should not be blocked.
-  event_generator.PressTouch();
-  event_generator.ReleaseTouch();
-  EXPECT_GT(counter.event_count(), 0u);
-  counter.reset();
-
-  gfx::Vector3dF base;
-
-  // Lid open 90 degrees.
-  TriggerAccelerometerUpdate(gfx::Vector3dF(0.0f, 0.0f, 1.0f),
-                             gfx::Vector3dF(-1.0f, 0.0f, 0.0f));
-
-  event_generator.PressKey(ui::VKEY_ESCAPE, 0);
-  event_generator.ReleaseKey(ui::VKEY_ESCAPE, 0);
-  EXPECT_GT(counter.event_count(), 0u);
-  counter.reset();
-}
-
 #if defined(OS_CHROMEOS)
 // Tests that a screenshot can be taken in maximize mode by holding volume down
 // and pressing power.