Updates PointerEventRouter to handle switching move type

services/ui/public/cpp/tests/window_tree_client_unittest.cc

 // Copyright 2015 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 "services/ui/public/cpp/window_tree_client.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 79 matching lines @@
 
   TestWindowTreeClientDelegate* window_tree_delegate() {
     return &window_tree_delegate_;
   }
 
   Window* GetFirstRoot() {
     return client()->GetRoots().empty() ? nullptr
                                         : *client()->GetRoots().begin();
   }
 
-  uint32_t GetPointerWatcherId() {
-    return WindowTreeClientPrivate(&tree_client_).pointer_watcher_id();
-  }
-
  private:
   TestWindowTree window_tree_;
   TestWindowTreeClientDelegate window_tree_delegate_;
   WindowTreeClient tree_client_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeSetup);
 };
 
 class TestInputEventHandler : public InputEventHandler {
  public:
@@ skipping 358 matching lines @@
 // window tree.
 TEST_F(WindowTreeClientTest, OnPointerEventObserved) {
   WindowTreeSetup setup;
   Window* root = setup.GetFirstRoot();
   ASSERT_TRUE(root);
 
   // Start a pointer watcher for all events excluding move events.
   setup.client()->StartPointerWatcher(false /* want_moves */);
 
   // Simulate the server sending an observed event.
-  uint32_t pointer_watcher_id = setup.GetPointerWatcherId();
   std::unique_ptr<ui::PointerEvent> pointer_event_down(new ui::PointerEvent(
       ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_CONTROL_DOWN, 1,
       ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH),
       base::TimeTicks()));
   setup.window_tree_client()->OnPointerEventObserved(
-      std::move(pointer_event_down), pointer_watcher_id, 0u);
+      std::move(pointer_event_down), 0u);
 
   // Delegate sensed the event.
   ui::Event* last_event = setup.window_tree_delegate()->last_event_observed();
   EXPECT_EQ(ui::ET_POINTER_DOWN, last_event->type());
   EXPECT_EQ(ui::EF_CONTROL_DOWN, last_event->flags());
   setup.window_tree_delegate()->Reset();
 
   // Stop the pointer watcher.
   setup.client()->StopPointerWatcher();
 
   // Simulate another event from the server.
   std::unique_ptr<ui::PointerEvent> pointer_event_up(new ui::PointerEvent(
       ui::ET_POINTER_UP, gfx::Point(), gfx::Point(), ui::EF_CONTROL_DOWN, 1,
       ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH),
       base::TimeTicks()));
   setup.window_tree_client()->OnPointerEventObserved(
-      std::move(pointer_event_up), pointer_watcher_id, 0u);
+      std::move(pointer_event_up), 0u);
 
   // No event was sensed.
   EXPECT_FALSE(setup.window_tree_delegate()->last_event_observed());
 }
 
 // Tests pointer watchers triggered by events that hit this window tree.
 TEST_F(WindowTreeClientTest, OnWindowInputEventWithPointerWatcher) {
   WindowTreeSetup setup;
   Window* root = setup.GetFirstRoot();
   ASSERT_TRUE(root);
 
   // Start a pointer watcher for all events excluding move events.
   setup.client()->StartPointerWatcher(false /* want_moves */);
 
   // Simulate the server dispatching an event that also matched the observer.
-  uint32_t pointer_watcher_id = setup.GetPointerWatcherId();
   std::unique_ptr<ui::PointerEvent> pointer_event_down(new ui::PointerEvent(
       ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_CONTROL_DOWN, 1,
       ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH),
       base::TimeTicks()));
   setup.window_tree_client()->OnWindowInputEvent(
-      1, server_id(root), std::move(pointer_event_down), pointer_watcher_id);
+      1, server_id(root), std::move(pointer_event_down), true);
 
   // Delegate sensed the event.
   ui::Event* last_event = setup.window_tree_delegate()->last_event_observed();
   EXPECT_EQ(ui::ET_POINTER_DOWN, last_event->type());
   EXPECT_EQ(ui::EF_CONTROL_DOWN, last_event->flags());
 }
 
-// Tests that replacing a pointer watcher with a new one that has different
-// |want_moves| values results in only new events being observed.
-TEST_F(WindowTreeClientTest, PointerWatcherReplaced) {

[msw, 2016/08/18 22:45:23]

Is there a way to keep this test, perhaps at a different level?
(does something similar already exist at window_tree_unittest.cc?)

[sky, 2016/08/18 23:17:14]

Previously this case was interesting because of the complexity and remembering
of ids. Now that ids are gone this case isn't particular interesting that it
warrants a test.

-  WindowTreeSetup setup;
-  Window* root = setup.GetFirstRoot();
-  ASSERT_TRUE(root);
-
-  // Start a pointer watcher for all events excluding move events.
-  setup.client()->StartPointerWatcher(false /* want_moves */);
-  uint32_t pointer_watcher_id1 = setup.GetPointerWatcherId();
-
-  // Replace it with a second watcher that also watches for move events.
-  setup.client()->StartPointerWatcher(true /* want_moves */);
-  uint32_t pointer_watcher_id2 = setup.GetPointerWatcherId();
-
-  // Simulate the server sending an observed event that matched the old watcher
-  // (e.g. that was in-flight when the observer was replaced).
-  std::unique_ptr<ui::PointerEvent> pointer_event_down(new ui::PointerEvent(
-      ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_CONTROL_DOWN, 1,
-      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH),
-      base::TimeTicks()));
-  setup.window_tree_client()->OnPointerEventObserved(
-      std::move(pointer_event_down), pointer_watcher_id1, 0u);
-
-  // The event was not sensed, because it does not match the current watcher.
-  EXPECT_FALSE(setup.window_tree_delegate()->last_event_observed());
-
-  // Simulate another event that matches the new watcher.
-  std::unique_ptr<ui::PointerEvent> pointer_event_move(new ui::PointerEvent(
-      ui::ET_POINTER_MOVED, gfx::Point(), gfx::Point(), ui::EF_CONTROL_DOWN, 1,
-      ui::PointerDetails(ui::EventPointerType::POINTER_TYPE_TOUCH),
-      base::TimeTicks()));
-  setup.window_tree_client()->OnPointerEventObserved(
-      std::move(pointer_event_move), pointer_watcher_id2, 0u);
-
-  // The delegate sensed the event.
-  ui::Event* last_event = setup.window_tree_delegate()->last_event_observed();
-  EXPECT_EQ(ui::ET_POINTER_MOVED, last_event->type());
-  EXPECT_EQ(ui::EF_CONTROL_DOWN, last_event->flags());
-}
-
 // Verifies focus is reverted if the server replied that the change failed.
 TEST_F(WindowTreeClientTest, SetFocusFailed) {
   WindowTreeSetup setup;
   Window* root = setup.GetFirstRoot();
   ASSERT_TRUE(root);
   root->SetVisible(true);
   Window* child = setup.client()->NewWindow();
   child->SetVisible(true);
   root->AddChild(child);
   Window* original_focus = setup.client()->GetFocusedWindow();
@@ skipping 536 matching lines @@
 
   // Changes originating from server should notify observers too.
   WindowTreeClientPrivate(setup.client()).CallOnCaptureChanged(child2, nullptr);
   EXPECT_EQ(1, capture_recorder.capture_changed_count());
   EXPECT_EQ(child2_id, capture_recorder.last_gained_capture_window_id());
   EXPECT_EQ(0, capture_recorder.last_lost_capture_window_id());
   capture_recorder.reset_capture_captured_count();
 }
 
 }  // namespace ui