Updates PointerEventRouter to handle switching move type

ui/views/mus/pointer_watcher_event_router_unittest.cc

 // Copyright 2016 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 "ui/views/mus/pointer_watcher_event_router.h"
 
 #include <memory>
 
 #include "base/message_loop/message_loop.h"
+#include "services/ui/public/cpp/tests/window_tree_client_private.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/pointer_watcher.h"
 #include "ui/views/test/scoped_views_test_helper.h"
 
 namespace views {
 namespace {
 
 class TestPointerWatcher : public PointerWatcher {
@@ skipping 24 matching lines @@
  public:
   PointerWatcherEventRouterTest() {}
   ~PointerWatcherEventRouterTest() override {}
 
   void OnPointerEventObserved(const ui::PointerEvent& event) {
     WindowManagerConnection::Get()
         ->pointer_watcher_event_router()
         ->OnPointerEventObserved(event, nullptr);
   }
 
+  PointerWatcherEventRouter::EventTypes event_types() const {
+    return WindowManagerConnection::Get()
+        ->pointer_watcher_event_router()
+        ->event_types_;
+  }
+
  private:
   DISALLOW_COPY_AND_ASSIGN(PointerWatcherEventRouterTest);
 };
 
+TEST_F(PointerWatcherEventRouterTest, EventTypes) {
+  base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
+  ScopedViewsTestHelper helper;
+  TestPointerWatcher pointer_watcher1, pointer_watcher2;
+  PointerWatcherEventRouter* pointer_watcher_event_router =
+      WindowManagerConnection::Get()->pointer_watcher_event_router();
+  ui::WindowTreeClientPrivate test_api(
+      WindowManagerConnection::Get()->client());
+  EXPECT_FALSE(test_api.HasPointerWatcher());
+
+  // Start with no moves.
+  pointer_watcher_event_router->AddPointerWatcher(&pointer_watcher1, false);
+  EXPECT_EQ(PointerWatcherEventRouter::EventTypes::NON_MOVE_EVENTS,
+            event_types());
+  EXPECT_TRUE(test_api.HasPointerWatcher());
+
+  // Add moves.
+  pointer_watcher_event_router->AddPointerWatcher(&pointer_watcher2, true);
+  EXPECT_EQ(PointerWatcherEventRouter::EventTypes::MOVE_EVENTS, event_types());
+  EXPECT_TRUE(test_api.HasPointerWatcher());
+
+  // Remove no-moves.
+  pointer_watcher_event_router->RemovePointerWatcher(&pointer_watcher1);
+  EXPECT_EQ(PointerWatcherEventRouter::EventTypes::MOVE_EVENTS, event_types());
+  EXPECT_TRUE(test_api.HasPointerWatcher());
+
+  // Remove moves.

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

optional nit: test the transition from MOVE_EVENTS to NON_MOVE_EVENTS?

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

Done.

+  pointer_watcher_event_router->RemovePointerWatcher(&pointer_watcher2);
+  EXPECT_EQ(PointerWatcherEventRouter::EventTypes::NONE, event_types());
+  EXPECT_FALSE(test_api.HasPointerWatcher());
+}
+
 TEST_F(PointerWatcherEventRouterTest, PointerWatcherNoMove) {
   base::MessageLoop message_loop(base::MessageLoop::TYPE_UI);
   ScopedViewsTestHelper helper;
   ASSERT_TRUE(WindowManagerConnection::Get());
   PointerWatcherEventRouter* pointer_watcher_event_router =
       WindowManagerConnection::Get()->pointer_watcher_event_router();
   ASSERT_TRUE(pointer_watcher_event_router);
 
   ui::PointerEvent pointer_event_down(
       ui::ET_POINTER_DOWN, gfx::Point(), gfx::Point(), ui::EF_NONE, 1,
@@ skipping 87 matching lines @@
   watcher2.Reset();
 
   // Removing the last PointerWatcher stops sending events to it.
   pointer_watcher_event_router->RemovePointerWatcher(&watcher2);
   OnPointerEventObserved(pointer_event_move);
   EXPECT_FALSE(watcher1.last_event_observed());
   EXPECT_FALSE(watcher2.last_event_observed());
 }
 
 }  // namespace views