NOSUBMIT: PointerWatcher observes all pointer events, with moves optional

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 448 matching lines @@
   event_handler.set_should_manually_ack();
   setup.window_tree_client()->OnWindowInputEvent(
       33, server_id(root), ui::Event::Clone(*ui_event.get()), 0);
   EXPECT_TRUE(event_handler.received_event());
   EXPECT_FALSE(setup.window_tree()->WasEventAcked(33));
 
   event_handler.AckEvent();
   EXPECT_TRUE(setup.window_tree()->WasEventAcked(33));
 }
 
+// JAMES - rewrite for StartPointerWatcher. It should be simpler since we won't
+// have to construct all the EventMatchers.
+#if 0
+
 // Tests event observers triggered by events that did not hit a target in this
 // window tree.
 TEST_F(WindowTreeClientTest, OnEventObserved) {
   WindowTreeSetup setup;
   Window* root = setup.GetFirstRoot();
   ASSERT_TRUE(root);
 
   // Set up an event observer.
   mojom::EventMatcherPtr matcher = mojom::EventMatcher::New();
   matcher->type_matcher = mojom::EventTypeMatcher::New();
@@ skipping 89 matching lines @@
                          ui::EventTimeForNow(), ui::EF_CONTROL_DOWN, 0));
   setup.window_tree_client()->OnEventObserved(std::move(released_event),
                                               event_observer_id2);
 
   // The delegate sensed the event.
   ui::Event* last_event = setup.window_tree_delegate()->last_event_observed();
   EXPECT_EQ(ui::ET_MOUSE_RELEASED, last_event->type());
   EXPECT_EQ(ui::EF_CONTROL_DOWN, last_event->flags());
 }
 
+#endif
+// JAMES
+
 // 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 454 matching lines @@
 
   // Create a new Window, and attempt to place capture on that.
   Window* child = setup.client()->NewWindow();
   child->SetVisible(true);
   root->AddChild(child);
   child->SetCapture();
   EXPECT_TRUE(child->HasCapture());
 }
 
 }  // namespace ui