Change mojo geometry structs from using type converters to StructTraits.

components/mus/ws/test_change_tracker.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 "components/mus/ws/test_change_tracker.h"
 
 #include <stddef.h>
 
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "components/mus/common/util.h"
 #include "mojo/common/common_type_converters.h"
 
 using mojo::Array;
 using mojo::String;
 
 namespace mus {
 
 namespace ws {
 
 std::string WindowIdToString(Id id) {
   return (id == 0) ? "null"
                    : base::StringPrintf("%d,%d", HiWord(id), LoWord(id));
 }
 
 namespace {
 
-std::string RectToString(const mojo::Rect& rect) {
-  return base::StringPrintf("%d,%d %dx%d", rect.x, rect.y, rect.width,
-                            rect.height);
-}
-
 std::string DirectionToString(mojom::OrderDirection direction) {
   return direction == mojom::OrderDirection::ABOVE ? "above" : "below";
 }
 
 enum class ChangeDescriptionType {
   ONE,
   TWO,
 };
 
 std::string ChangeToDescription(const Change& change,
@@ skipping 19 matching lines @@
 
     case CHANGE_TYPE_NODE_ADD_TRANSIENT_WINDOW:
       return base::StringPrintf("AddTransientWindow parent = %s child = %s",
                                 WindowIdToString(change.window_id).c_str(),
                                 WindowIdToString(change.window_id2).c_str());
 
     case CHANGE_TYPE_NODE_BOUNDS_CHANGED:
       return base::StringPrintf(
           "BoundsChanged window=%s old_bounds=%s new_bounds=%s",
           WindowIdToString(change.window_id).c_str(),
-          RectToString(change.bounds).c_str(),
-          RectToString(change.bounds2).c_str());
+          change.bounds.ToString().c_str(), change.bounds2.ToString().c_str());
 
     case CHANGE_TYPE_NODE_HIERARCHY_CHANGED:
       return base::StringPrintf(
           "HierarchyChanged window=%s old_parent=%s new_parent=%s",
           WindowIdToString(change.window_id).c_str(),
           WindowIdToString(change.window_id2).c_str(),
           WindowIdToString(change.window_id3).c_str());
 
     case CHANGE_TYPE_NODE_REMOVE_TRANSIENT_WINDOW_FROM_PARENT:
       return base::StringPrintf(
@@ skipping 165 matching lines @@
 }
 
 void TestChangeTracker::OnEmbeddedAppDisconnected(Id window_id) {
   Change change;
   change.type = CHANGE_TYPE_EMBEDDED_APP_DISCONNECTED;
   change.window_id = window_id;
   AddChange(change);
 }
 
 void TestChangeTracker::OnWindowBoundsChanged(Id window_id,
-                                              mojo::RectPtr old_bounds,
-                                              mojo::RectPtr new_bounds) {
+                                              const gfx::Rect& old_bounds,
+                                              const gfx::Rect& new_bounds) {
   Change change;
   change.type = CHANGE_TYPE_NODE_BOUNDS_CHANGED;
   change.window_id = window_id;
-  change.bounds.x = old_bounds->x;
-  change.bounds.y = old_bounds->y;
-  change.bounds.width = old_bounds->width;
-  change.bounds.height = old_bounds->height;
-  change.bounds2.x = new_bounds->x;
-  change.bounds2.y = new_bounds->y;
-  change.bounds2.width = new_bounds->width;
-  change.bounds2.height = new_bounds->height;
+  change.bounds = old_bounds;
+  change.bounds2 = new_bounds;
   AddChange(change);
 }
 
 void TestChangeTracker::OnUnembed(Id window_id) {
   Change change;
   change.type = CHANGE_TYPE_UNEMBED;
   change.window_id = window_id;
   AddChange(change);
 }
 
@@ skipping 169 matching lines @@
 
 std::string TestWindow::ToString2() const {
   return base::StringPrintf(
       "window=%s parent=%s visible=%s", WindowIdToString(window_id).c_str(),
       WindowIdToString(parent_id).c_str(), visible ? "true" : "false");
 }
 
 }  // namespace ws
 
 }  // namespace mus