Overhaul Mandoline event transport code

components/view_manager/view_tree_unittest.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 <string>
 #include <vector>
 
 #include "base/message_loop/message_loop.h"
 #include "components/view_manager/client_connection.h"
 #include "components/view_manager/connection_manager.h"
@@ skipping 232 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestDisplayManagerFactory);
 };
 
 mojo::EventPtr CreatePointerDownEvent(int x, int y) {
   mojo::EventPtr event(mojo::Event::New());
   event->action = mojo::EVENT_TYPE_POINTER_DOWN;
   event->pointer_data = mojo::PointerData::New();
   event->pointer_data->pointer_id = 1u;
-  event->pointer_data->x = x;
-  event->pointer_data->y = y;
+  event->pointer_data->where->x = x;
+  event->pointer_data->where->y = y;
   return event.Pass();
 }
 
 mojo::EventPtr CreatePointerUpEvent(int x, int y) {
   mojo::EventPtr event(mojo::Event::New());
   event->action = mojo::EVENT_TYPE_POINTER_UP;
   event->pointer_data = mojo::PointerData::New();
   event->pointer_data->pointer_id = 1u;
-  event->pointer_data->x = x;
-  event->pointer_data->y = y;
+  event->pointer_data->where->x = x;
+  event->pointer_data->where->y = y;
   return event.Pass();
 }
 
 }  // namespace
 
 // -----------------------------------------------------------------------------
 
 class ViewTreeTest : public testing::Test {
  public:
   ViewTreeTest() : wm_client_(nullptr) {}
@@ skipping 167 matching lines @@
   EXPECT_EQ("Focused id=2,1",
             ChangesToDescription1(*wm_client()->tracker()->changes())[0]);
   ASSERT_EQ(2u, embed_connection->tracker()->changes()->size());
   EXPECT_EQ("Focused id=2,1",
             ChangesToDescription1(*embed_connection->tracker()->changes())[0]);
   EXPECT_EQ("InputEvent view=2,1 event_action=4",
             ChangesToDescription1(*embed_connection->tracker()->changes())[1]);
 }
 
 }  // namespace view_manager