Change mojo geometry structs from using type converters to StructTraits.

components/mus/public/cpp/tests/window_tree_client_impl_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/public/cpp/lib/window_tree_client_impl.h"
 
 #include <stdint.h>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "components/mus/common/util.h"
 #include "components/mus/public/cpp/input_event_handler.h"
 #include "components/mus/public/cpp/lib/window_private.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/tests/test_window.h"
 #include "components/mus/public/cpp/tests/test_window_tree.h"
 #include "components/mus/public/cpp/tests/window_tree_client_impl_private.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_observer.h"
 #include "components/mus/public/cpp/window_property.h"
 #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"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace mus {
 
 namespace {
 
@@ skipping 146 matching lines @@
   const gfx::Rect new_bounds(gfx::Rect(0, 0, 100, 100));
   ASSERT_NE(new_bounds, root->bounds());
   root->SetBounds(new_bounds);
   EXPECT_EQ(new_bounds, root->bounds());
   uint32_t change_id;
   ASSERT_TRUE(setup.window_tree()->GetAndClearChangeId(&change_id));
 
   // 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());
 
   // Tell the client the change failed, which should trigger failing to the
   // most recent bounds from server.
   setup.window_tree_client()->OnChangeCompleted(change_id, false);
   EXPECT_EQ(server_changed_bounds, root->bounds());
 
   // 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());
 }
 
 TEST_F(WindowTreeClientImplTest, TwoInFlightBoundsChangesBothCanceled) {
   WindowTreeSetup setup;
   Window* root = setup.GetFirstRoot();
   ASSERT_TRUE(root);
   const gfx::Rect original_bounds(root->bounds());
   const gfx::Rect bounds1(gfx::Rect(0, 0, 100, 100));
   const gfx::Rect bounds2(gfx::Rect(0, 0, 100, 102));
@@ skipping 545 matching lines @@
   EXPECT_FALSE(root2->visible());
 
   // Ack the request to the windowtree to create the new window.
   uint32_t change_id;
   ASSERT_TRUE(setup.window_tree()->GetAndClearChangeId(&change_id));
   EXPECT_EQ(setup.window_tree()->window_id(), server_id(root2));
 
   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);
 
   // 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());
 }
 
 TEST_F(WindowTreeClientImplTest, NewTopLevelWindowGetsAllChangesInFlight) {
   WindowTreeSetup setup;
   Window* root1 = setup.GetFirstRoot();
   ASSERT_TRUE(root1);
   Window* root2 = setup.window_tree_connection()->NewTopLevelWindow(nullptr);
   ASSERT_TRUE(root2);
 
@@ skipping 28 matching lines @@
   root2->SetSharedProperty<std::string>("xx", "client_xx");
   uint32_t property_in_flight_change_id;
   ASSERT_TRUE(
       setup.window_tree()->GetAndClearChangeId(&property_in_flight_change_id));
   EXPECT_NE(bounds_in_flight_change_id, property_in_flight_change_id);
 
   // Ack the new window top level window. Vis and bounds shouldn't change.
   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"));
   setup.window_tree_client()->OnTopLevelCreated(new_window_in_flight_change_id,
                                                 std::move(data), true);
 
   // The only value that should take effect is the property for 'yy' as it was
   // 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"));
   EXPECT_EQ("server_yy", root2->GetSharedProperty<std::string>("yy"));
   ASSERT_TRUE(root2->HasSharedProperty("xx"));
   EXPECT_EQ("client_xx", root2->GetSharedProperty<std::string>("xx"));
 
   // Tell the client the changes failed. This should cause the values to change
   // to that of the server.
   setup.window_tree_client()->OnChangeCompleted(vis_in_flight_change_id1,
@@ skipping 168 matching lines @@
 
   setup.window_tree_client()->OnChangeCompleted(change_id2, false);
   EXPECT_FALSE(child->HasCapture());
   EXPECT_TRUE(root->HasCapture());
 
   setup.window_tree_client()->OnLostCapture(server_id(root));
   EXPECT_FALSE(root->HasCapture());
 }
 
 }  // namespace mus