Update PointerEvent handled state correctly in OnWindowInputEvent.

ui/aura/mus/window_tree_client.cc

 // Copyright 2014 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/aura/mus/window_tree_client.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 144 matching lines @@
     return;
   }
   const gfx::Point host_location =
       gfx::ConvertPointToDIP(display.device_scale_factor(), event->location());
   event->set_location(host_location);
   const gfx::Point root_location = gfx::ConvertPointToDIP(
       display.device_scale_factor(), event->root_location());
   event->set_root_location(root_location);
 }
 
+// Create and return a MouseEvent or TouchEvent from |event| if |event| is a
+// PointerEvent, otherwise return the copy of |event|.
+std::unique_ptr<ui::Event> MapEvent(const ui::Event& event) {
+  if (event.IsMousePointerEvent()) {
+    if (event.type() == ui::ET_POINTER_WHEEL_CHANGED)
+      return base::MakeUnique<ui::MouseWheelEvent>(*event.AsPointerEvent());
+    return base::MakeUnique<ui::MouseEvent>(*event.AsPointerEvent());
+  }
+  if (event.IsTouchPointerEvent())
+    return base::MakeUnique<ui::TouchEvent>(*event.AsPointerEvent());
+  return ui::Event::Clone(event);
+}
+
 // Set the |target| to be the target window of this |event| and send it to
 // the EventSink.
 void DispatchEventToTarget(ui::Event* event, WindowMus* target) {
   ui::Event::DispatcherApi dispatch_helper(event);
   dispatch_helper.set_target(target->GetWindow());
   GetWindowTreeHostMus(target)->SendEventToSink(event);
 }
 
 }  // namespace
 
@@ skipping 1056 matching lines @@
 
   // TODO: use |display_id| to find host and send there.
   if (!window || !window->GetWindow()->GetHost()) {
     tree_->OnWindowInputEventAck(event_id, ui::mojom::EventResult::UNHANDLED);
     return;
   }
 
   EventAckHandler ack_handler(CreateEventResultCallback(event_id));
   // TODO(moshayedi): crbug.com/617222. No need to convert to ui::MouseEvent or
   // ui::TouchEvent once we have proper support for pointer events.
-  if (event->IsMousePointerEvent()) {
-    if (event->type() == ui::ET_POINTER_WHEEL_CHANGED) {
-      ui::MouseWheelEvent mapped_event(*event->AsPointerEvent());
-      DispatchEventToTarget(&mapped_event, window);
-    } else {
-      ui::MouseEvent mapped_event(*event->AsPointerEvent());
-      DispatchEventToTarget(&mapped_event, window);
-    }
-  } else if (event->IsTouchPointerEvent()) {
-    ui::TouchEvent mapped_event(*event->AsPointerEvent());
-    DispatchEventToTarget(&mapped_event, window);
-  } else {
-    DispatchEventToTarget(event.get(), window);
-  }
-  ack_handler.set_handled(event->handled());
+  std::unique_ptr<ui::Event> mapped_event = MapEvent(*event.get());
+  DispatchEventToTarget(mapped_event.get(), window);
+  ack_handler.set_handled(mapped_event->handled());
 }
 
 void WindowTreeClient::OnPointerEventObserved(std::unique_ptr<ui::Event> event,
                                               uint32_t window_id,
                                               int64_t display_id) {
   DCHECK(event);
   DCHECK(event->IsPointerEvent());
   if (!has_pointer_watcher_)
     return;
 
@@ skipping 693 matching lines @@
   return ScheduleInFlightChange(base::MakeUnique<InFlightCaptureChange>(
       this, capture_synchronizer_.get(), window));
 }
 
 uint32_t WindowTreeClient::CreateChangeIdForFocus(WindowMus* window) {
   return ScheduleInFlightChange(base::MakeUnique<InFlightFocusChange>(
       this, focus_synchronizer_.get(), window));
 }
 
 }  // namespace aura