Change mojo geometry structs from using type converters to StructTraits.

components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc

Index: components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc
diff --git a/components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc b/components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc
index fe375f0d93ae6e80dc4c53ace9ddef3ba7662cf4..4bf5bb7eddb7eea5bd9f3bd694e95f66b4a104b7 100644
--- a/components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc
+++ b/components/mus/public/cpp/tests/window_tree_client_impl_unittest.cc
@@ -21,7 +21,6 @@
 #include "components/mus/public/cpp/window_tracker.h"
 #include "components/mus/public/cpp/window_tree_delegate.h"
 #include "mojo/common/common_type_converters.h"
-#include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/input_events/input_events_type_converters.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
@@ -188,8 +187,7 @@ TEST_F(WindowTreeClientImplTest, SetBoundsFailedWithPendingChange) {
   // Simulate the server responding with a bounds change.
   const gfx::Rect server_changed_bounds(gfx::Rect(0, 0, 101, 102));
   setup.window_tree_client()->OnWindowBoundsChanged(
-      server_id(root), mojo::Rect::From(original_bounds),
-      mojo::Rect::From(server_changed_bounds));
+      server_id(root), original_bounds, server_changed_bounds);
 
   // This shouldn't trigger the bounds changing yet.
   EXPECT_EQ(new_bounds, root->bounds());
@@ -201,8 +199,7 @@ TEST_F(WindowTreeClientImplTest, SetBoundsFailedWithPendingChange) {
 
   // Simulate server changing back to original bounds. Should take immediately.
   setup.window_tree_client()->OnWindowBoundsChanged(
-      server_id(root), mojo::Rect::From(server_changed_bounds),
-      mojo::Rect::From(original_bounds));
+      server_id(root), server_changed_bounds, original_bounds);
   EXPECT_EQ(original_bounds, root->bounds());
 }
 
@@ -768,8 +765,8 @@ TEST_F(WindowTreeClientImplTest, NewTopLevelWindowGetsPropertiesFromData) {
   mojom::WindowDataPtr data = mojom::WindowData::New();
   data->window_id = server_id(root2);
   data->viewport_metrics = mojom::ViewportMetrics::New();
-  data->viewport_metrics->size_in_pixels = mojo::Size::From(gfx::Size(1, 2));
-  data->bounds = mojo::Rect::From(gfx::Rect(1, 2, 3, 4));
+  data->viewport_metrics->size_in_pixels = gfx::Size(1, 2);
+  data->bounds = gfx::Rect(1, 2, 3, 4);
   data->visible = true;
   setup.window_tree_client()->OnTopLevelCreated(change_id, std::move(data),
                                                 true);
@@ -777,8 +774,7 @@ TEST_F(WindowTreeClientImplTest, NewTopLevelWindowGetsPropertiesFromData) {
   // Make sure all the properties took.
   EXPECT_TRUE(root2->IsDrawn());
   EXPECT_TRUE(root2->visible());
-  EXPECT_EQ(gfx::Size(1, 2),
-            root2->viewport_metrics().size_in_pixels.To<gfx::Size>());
+  EXPECT_EQ(gfx::Size(1, 2), root2->viewport_metrics().size_in_pixels);
   EXPECT_EQ(gfx::Rect(1, 2, 3, 4), root2->bounds());
 }
 
@@ -827,8 +823,8 @@ TEST_F(WindowTreeClientImplTest, NewTopLevelWindowGetsAllChangesInFlight) {
   mojom::WindowDataPtr data = mojom::WindowData::New();
   data->window_id = server_id(root2);
   data->viewport_metrics = mojom::ViewportMetrics::New();
-  data->viewport_metrics->size_in_pixels = mojo::Size::From(gfx::Size(1, 2));
-  data->bounds = mojo::Rect::From(gfx::Rect(1, 2, 3, 4));
+  data->viewport_metrics->size_in_pixels = gfx::Size(1, 2);
+  data->bounds = gfx::Rect(1, 2, 3, 4);
   data->visible = true;
   data->properties["xx"] = mojo::Array<uint8_t>::From(std::string("server_xx"));
   data->properties["yy"] = mojo::Array<uint8_t>::From(std::string("server_yy"));
@@ -839,8 +835,7 @@ TEST_F(WindowTreeClientImplTest, NewTopLevelWindowGetsAllChangesInFlight) {
   // not in flight.
   EXPECT_TRUE(WindowPrivate(root2).parent_drawn());
   EXPECT_FALSE(root2->visible());
-  EXPECT_EQ(gfx::Size(1, 2),
-            root2->viewport_metrics().size_in_pixels.To<gfx::Size>());
+  EXPECT_EQ(gfx::Size(1, 2), root2->viewport_metrics().size_in_pixels);
   EXPECT_EQ(gfx::Rect(5, 6, 7, 8), root2->bounds());
   EXPECT_EQ(2u, root2->shared_properties().size());
   ASSERT_TRUE(root2->HasSharedProperty("yy"));