Change mojo geometry structs from using type converters to StructTraits.

components/mus/ws/test_change_tracker.h

 // 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.
 
 #ifndef COMPONENTS_MUS_WS_TEST_CHANGE_TRACKER_H_
 #define COMPONENTS_MUS_WS_TEST_CHANGE_TRACKER_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 58 matching lines @@
   Change();
   Change(const Change& other);
   ~Change();
 
   ChangeType type;
   ConnectionSpecificId connection_id;
   std::vector<TestWindow> windows;
   Id window_id;
   Id window_id2;
   Id window_id3;
-  mojo::Rect bounds;
-  mojo::Rect bounds2;
+  gfx::Rect bounds;
+  gfx::Rect bounds2;
   int32_t event_action;
   uint32_t event_observer_id;
   mojo::String embed_url;
   mojom::OrderDirection direction;
   bool bool_value;
   float float_value;
   std::string property_key;
   std::string property_value;
   int32_t cursor_id;
   uint32_t change_id;
@@ skipping 45 matching lines @@
   // WindowTreeClient function.
   void OnEmbed(ConnectionSpecificId connection_id,
                mojom::WindowDataPtr root,
                bool drawn);
   void OnEmbeddedAppDisconnected(Id window_id);
   void OnUnembed(Id window_id);
   void OnLostCapture(Id window_id);
   void OnTransientWindowAdded(Id window_id, Id transient_window_id);
   void OnTransientWindowRemoved(Id window_id, Id transient_window_id);
   void OnWindowBoundsChanged(Id window_id,
-                             mojo::RectPtr old_bounds,
-                             mojo::RectPtr new_bounds);
+                             const gfx::Rect& old_bounds,
+                             const gfx::Rect& new_bounds);
   void OnWindowViewportMetricsChanged(mojom::ViewportMetricsPtr old_bounds,
                                       mojom::ViewportMetricsPtr new_bounds);
   void OnWindowHierarchyChanged(Id window_id,
                                 Id old_parent_id,
                                 Id new_parent_id,
                                 mojo::Array<mojom::WindowDataPtr> windows);
   void OnWindowReordered(Id window_id,
                          Id relative_window_id,
                          mojom::OrderDirection direction);
   void OnWindowDeleted(Id window_id);
@@ skipping 21 matching lines @@
   std::vector<Change> changes_;
 
   DISALLOW_COPY_AND_ASSIGN(TestChangeTracker);
 };
 
 }  // namespace ws
 
 }  // namespace mus
 
 #endif  // COMPONENTS_MUS_WS_TEST_CHANGE_TRACKER_H_