Converts some services to use aura-mus

ui/views/mus/pointer_watcher_event_router2.cc

Index: ui/views/mus/pointer_watcher_event_router2.cc
diff --git a/ui/views/mus/pointer_watcher_event_router2.cc b/ui/views/mus/pointer_watcher_event_router2.cc
index 916e43b20763034d2b0c619357a68846185e311a..f63405cde8e93f58debdf0d924d483e9871ed185 100644
--- a/ui/views/mus/pointer_watcher_event_router2.cc
+++ b/ui/views/mus/pointer_watcher_event_router2.cc
@@ -90,6 +90,7 @@ void PointerWatcherEventRouter2::OnPointerEventObserved(
     const ui::PointerEvent& event,
     aura::Window* target) {
   Widget* target_widget = nullptr;
+  ui::PointerEvent updated_event(event);
   if (target) {
     aura::Window* window = target;
     while (window && !target_widget) {
@@ -107,17 +108,27 @@ void PointerWatcherEventRouter2::OnPointerEventObserved(
       }
       window = window->parent();
     }
+    if (target_widget) {
+      gfx::Point widget_relative_location(event.location());
+      aura::Window::ConvertPointToTarget(target, target_widget->GetNativeView(),
+                                         &widget_relative_location);
+      updated_event.set_location(widget_relative_location);
+    }
   }
 
   // The mojo input events type converter uses the event root_location field
   // to store screen coordinates. Screen coordinates really should be returned
   // separately. See http://crbug.com/608547
-  gfx::Point location_in_screen = event.AsLocatedEvent()->root_location();
-  for (PointerWatcher& observer : move_watchers_)
-    observer.OnPointerEventObserved(event, location_in_screen, target_widget);
+  gfx::Point location_in_screen = event.root_location();
+  for (PointerWatcher& observer : move_watchers_) {
+    observer.OnPointerEventObserved(updated_event, location_in_screen,
+                                    target_widget);
+  }
   if (event.type() != ui::ET_POINTER_MOVED) {
-    for (PointerWatcher& observer : non_move_watchers_)
-      observer.OnPointerEventObserved(event, location_in_screen, target_widget);
+    for (PointerWatcher& observer : non_move_watchers_) {
+      observer.OnPointerEventObserved(updated_event, location_in_screen,
+                                      target_widget);
+    }
   }
 }