Change mojo geometry structs from using type converters to StructTraits.

mash/webtest/webtest.cc

 // Copyright 2016 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 "mash/webtest/webtest.h"
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/timer/timer.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "mash/public/interfaces/launchable.mojom.h"
 #include "mojo/public/c/system/main.h"
 #include "services/navigation/public/interfaces/view.mojom.h"
 #include "services/shell/public/cpp/application_runner.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/shell_client.h"
 #include "services/tracing/public/cpp/tracing_impl.h"
 #include "ui/aura/mus/mus_util.h"
 #include "ui/gfx/canvas.h"
-#include "ui/gfx/geometry/mojo/geometry_type_converters.h"
 #include "ui/gfx/paint_throbber.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "url/gurl.h"
@@ skipping 69 matching lines @@
                               const mojo::String& title,
                               bool can_go_back,
                               bool can_go_forward) override {
     current_title_ = base::UTF8ToUTF16(title.get());
     GetWidget()->UpdateWindowTitle();
   }
   void LoadProgressChanged(double progress) override {}
   void ViewCreated(navigation::mojom::ViewPtr view,
                    navigation::mojom::ViewClientRequest request,
                    bool is_popup,
-                   mojo::RectPtr initial_rect,
+                   const gfx::Rect& initial_rect,
                    bool user_gesture) override {
     views::Widget* window = views::Widget::CreateWindowWithContextAndBounds(
         new UI(webtest_, std::move(view), std::move(request)), nullptr,
-        initial_rect.To<gfx::Rect>());
+        initial_rect);
     window->Show();
     webtest_->AddWindow(window);
   }
   void Close() override {
     GetWidget()->Close();
   }
 
   Webtest* webtest_;
   mus::Window* content_area_ = nullptr;
   navigation::mojom::ViewPtr view_;
@@ skipping 56 matching lines @@
   AddWindow(window);
 }
 
 void Webtest::Create(shell::Connection* connection,
                      mojom::LaunchableRequest request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 }  // namespace webtest
 }  // namespace mash