Overhaul Mandoline event transport code

components/mus/gesture_manager_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 "components/mus/gesture_manager.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "components/mus/gesture_manager_delegate.h"
 #include "components/mus/public/cpp/keys.h"
@@ skipping 50 matching lines @@
 }
 
 mojo::EventPtr CreateEvent(mojo::EventType type,
                            int32_t pointer_id,
                            int x,
                            int y) {
   mojo::EventPtr event(mojo::Event::New());
   event->action = type;
   event->pointer_data = mojo::PointerData::New();
   event->pointer_data->pointer_id = pointer_id;
-  event->pointer_data->x = x;
-  event->pointer_data->y = y;
+  event->pointer_data->location->x = x;
+  event->pointer_data->location->y = y;
   return event.Pass();
 }
 
 struct CompareViewByConnectionId {
   bool operator()(const ServerView* a, const ServerView* b) {
     return a->id().connection_id < b->id().connection_id;
   }
 };
 
 std::string IDsToString(const std::set<uint32_t>& ids) {
@@ skipping 376 matching lines @@
   EXPECT_EQ(std::string(), gesture_delegate_.GetAndClearDescriptions());
 
   // Respond from the first view, with no gesture, should unblock cancel.
   SetGestures(&root_, pointer_id, kInvalidGestureId, SetWith(5u, 10u),
               std::set<uint32_t>());
   EXPECT_EQ("cancel pointer=1 connection=1 chosen=false",
             gesture_delegate_.GetAndClearDescriptions());
 }
 
 }  // namespace mus