Change mojo geometry structs from using type converters to StructTraits.

components/mus/ws/window_tree_client_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 <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "components/mus/public/cpp/tests/window_server_shelltest_base.h"
 #include "components/mus/public/interfaces/window_tree.mojom.h"
 #include "components/mus/public/interfaces/window_tree_host.mojom.h"
 #include "components/mus/ws/ids.h"
 #include "components/mus/ws/test_change_tracker.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 #include "services/shell/public/cpp/shell_test.h"
-#include "ui/gfx/geometry/mojo/geometry_type_converters.h"
 
 using mojo::Array;
 using mojo::Callback;
 using shell::Connection;
 using mojo::InterfaceRequest;
-using mojo::RectPtr;
 using shell::ShellClient;
 using mojo::String;
 using mus::mojom::ErrorCode;
 using mus::mojom::EventPtr;
 using mus::mojom::WindowDataPtr;
 using mus::mojom::WindowTree;
 using mus::mojom::WindowTreeClient;
 
 namespace mus {
 namespace ws {
@@ skipping 258 matching lines @@
   void OnLostCapture(Id window_id) override {
     tracker()->OnLostCapture(window_id);
   }
   void OnTopLevelCreated(uint32_t change_id,
                          mojom::WindowDataPtr data,
                          int64_t display_id,
                          bool drawn) override {
     tracker()->OnTopLevelCreated(change_id, std::move(data), drawn);
   }
   void OnWindowBoundsChanged(Id window_id,
-                             RectPtr old_bounds,
-                             RectPtr new_bounds) override {
+                             const gfx::Rect& old_bounds,
+                             const gfx::Rect& new_bounds) override {
     // The bounds of the root may change during startup on Android at random
     // times. As this doesn't matter, and shouldn't impact test exepctations,
     // it is ignored.
     if (window_id == root_window_id_ && !track_root_bounds_changes_)
       return;
-    tracker()->OnWindowBoundsChanged(window_id, std::move(old_bounds),
-                                     std::move(new_bounds));
+    tracker()->OnWindowBoundsChanged(window_id, old_bounds, new_bounds);
   }
   void OnClientAreaChanged(
       uint32_t window_id,
-      mojo::InsetsPtr new_client_area,
-      mojo::Array<mojo::RectPtr> new_additional_client_areas) override {}
+      const gfx::Insets& new_client_area,
+      mojo::Array<gfx::Rect> new_additional_client_areas) override {}
   void OnTransientWindowAdded(uint32_t window_id,
                               uint32_t transient_window_id) override {
     tracker()->OnTransientWindowAdded(window_id, transient_window_id);
   }
   void OnTransientWindowRemoved(uint32_t window_id,
                                 uint32_t transient_window_id) override {
     tracker()->OnTransientWindowRemoved(window_id, transient_window_id);
   }
   void OnWindowHierarchyChanged(Id window,
                                 Id old_parent,
@@ skipping 56 matching lines @@
     window_manager_binding_.reset(
         new mojo::AssociatedBinding<mojom::WindowManager>(this,
                                                           std::move(internal)));
     tree_->GetWindowManagerClient(
         GetProxy(&window_manager_client_, tree_.associated_group()));
   }
 
   // mojom::WindowManager:
   void WmSetBounds(uint32_t change_id,
                    uint32_t window_id,
-                   mojo::RectPtr bounds) override {
+                   const gfx::Rect& bounds) override {
     window_manager_client_->WmResponse(change_id, false);
   }
   void WmSetProperty(uint32_t change_id,
                      uint32_t window_id,
                      const mojo::String& name,
                      mojo::Array<uint8_t> value) override {
     window_manager_client_->WmResponse(change_id, false);
   }
   void WmCreateTopLevelWindow(
       uint32_t change_id,
@@ skipping 795 matching lines @@
   Id window_1_1 = wt_client1()->NewWindow(1);
   ASSERT_TRUE(window_1_1);
   ASSERT_TRUE(wt_client1()->AddWindow(root_window_id(), window_1_1));
 
   ASSERT_NO_FATAL_FAILURE(EstablishSecondClient(false));
 
   changes2()->clear();
 
   wt_client2_->set_track_root_bounds_changes(true);
 
-  wt1()->SetWindowBounds(10, window_1_1,
-                         mojo::Rect::From(gfx::Rect(0, 0, 100, 100)));
+  wt1()->SetWindowBounds(10, window_1_1, gfx::Rect(0, 0, 100, 100));
   ASSERT_TRUE(wt_client1()->WaitForChangeCompleted(10));
 
   wt_client2_->WaitForChangeCount(1);
   EXPECT_EQ("BoundsChanged window=" + IdToString(window_1_1) +
                 " old_bounds=0,0 0x0 new_bounds=0,0 100x100",
             SingleChangeToDescription(*changes2()));
 
   // Should not be possible to change the bounds of a window created by another
   // client.
-  wt2()->SetWindowBounds(11, window_1_1,
-                         mojo::Rect::From(gfx::Rect(0, 0, 0, 0)));
+  wt2()->SetWindowBounds(11, window_1_1, gfx::Rect(0, 0, 0, 0));
   ASSERT_FALSE(wt_client2()->WaitForChangeCompleted(11));
 }
 
 // Verify AddWindow fails when trying to manipulate windows in other roots.
 TEST_F(WindowTreeClientTest, CantMoveWindowsFromOtherRoot) {
   // Create 1 and 2 in the first client.
   Id window_1_1 = wt_client1()->NewWindow(1);
   Id window_1_2 = wt_client1()->NewWindow(2);
   ASSERT_TRUE(window_1_1);
   ASSERT_TRUE(window_1_2);
@@ skipping 716 matching lines @@
   const Id window_2_101 = wt_client2()->NewWindow(101);
   ASSERT_TRUE(wt_client2()->AddWindow(window_1_100_in_ws2, window_2_101));
   const Id window_2_101_in_ws1 = BuildWindowId(client_id_2(), 1);
   wt_client1()->WaitForChangeCount(1);
   EXPECT_EQ("HierarchyChanged window=" + IdToString(window_2_101_in_ws1) +
                 " old_parent=null new_parent=" + IdToString(window_1_100),
             SingleChangeToDescription(*changes1()));
   changes1()->clear();
 
   // Change the bounds of window_2_101 and make sure server gets it.
-  wt2()->SetWindowBounds(11, window_2_101,
-                         mojo::Rect::From(gfx::Rect(1, 2, 3, 4)));
+  wt2()->SetWindowBounds(11, window_2_101, gfx::Rect(1, 2, 3, 4));
   ASSERT_TRUE(wt_client2()->WaitForChangeCompleted(11));
   wt_client1()->WaitForChangeCount(1);
   EXPECT_EQ("BoundsChanged window=" + IdToString(window_2_101_in_ws1) +
                 " old_bounds=0,0 0x0 new_bounds=1,2 3x4",
             SingleChangeToDescription(*changes1()));
   changes2()->clear();
 
   // Remove 2_101 from wm, client1 should see the change.
   wt1()->RemoveWindowFromParent(12, window_2_101_in_ws1);
   ASSERT_TRUE(wt_client1()->WaitForChangeCompleted(12));
@@ skipping 61 matching lines @@
 
 // TODO(sky): make sure coverage of what was
 // WindowManagerTest.SecondEmbedRoot_InitService and
 // WindowManagerTest.MultipleEmbedRootsBeforeWTHReady gets added to window
 // manager
 // tests.
 
 }  // namespace test
 }  // namespace ws
 }  // namespace mus