NOSUBMIT: PointerWatcher observes all pointer events, with moves optional

services/ui/public/cpp/tests/window_tree_client_private.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 "services/ui/public/cpp/tests/window_tree_client_private.h"
 
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "ui/display/display.h"
 
 namespace ui {
 
 WindowTreeClientPrivate::WindowTreeClientPrivate(
     WindowTreeClient* tree_client_impl)
     : tree_client_impl_(tree_client_impl) {}
 
 WindowTreeClientPrivate::WindowTreeClientPrivate(Window* window)
     : WindowTreeClientPrivate(window->window_tree()) {}
 
 WindowTreeClientPrivate::~WindowTreeClientPrivate() {}
 
+// JAMES rename this
 uint32_t WindowTreeClientPrivate::event_observer_id() {
-  return tree_client_impl_->event_observer_id_;
+  return tree_client_impl_->pointer_watcher_id_;
 }
 
 void WindowTreeClientPrivate::OnEmbed(mojom::WindowTree* window_tree) {
   mojom::WindowDataPtr root_data(mojom::WindowData::New());
   root_data->parent_id = 0;
   root_data->window_id = 1;
   root_data->properties.SetToEmpty();
   root_data->visible = true;
   const int64_t display_id = 1;
   const Id focused_window_id = 0;
@@ skipping 23 matching lines @@
                                         std::move(event), observer_id);
 }
 
 void WindowTreeClientPrivate::SetTreeAndClientId(mojom::WindowTree* window_tree,
                                                  ClientSpecificId client_id) {
   tree_client_impl_->tree_ = window_tree;
   tree_client_impl_->client_id_ = client_id;
 }
 
 }  // namespace ui