Change mojo geometry structs from using type converters to StructTraits.

ui/gfx/geometry/mojo/geometry_type_converters.cc

Index: ui/gfx/geometry/mojo/geometry_type_converters.cc
diff --git a/ui/gfx/geometry/mojo/geometry_type_converters.cc b/ui/gfx/geometry/mojo/geometry_type_converters.cc
deleted file mode 100644
index 842560eaae3701e7cc1fa535eac199b6ae84cc44..0000000000000000000000000000000000000000
--- a/ui/gfx/geometry/mojo/geometry_type_converters.cc
+++ /dev/null
@@ -1,153 +0,0 @@
-// 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 "ui/gfx/geometry/mojo/geometry_type_converters.h"
-
-namespace mojo {
-
-// static
-PointPtr TypeConverter<PointPtr, gfx::Point>::Convert(const gfx::Point& input) {
-  PointPtr point(Point::New());
-  point->x = input.x();
-  point->y = input.y();
-  return point;
-}
-
-// static
-gfx::Point TypeConverter<gfx::Point, PointPtr>::Convert(const PointPtr& input) {
-  if (input.is_null())
-    return gfx::Point();
-  return gfx::Point(input->x, input->y);
-}
-
-// static
-PointFPtr TypeConverter<PointFPtr, gfx::PointF>::Convert(
-    const gfx::PointF& input) {
-  PointFPtr point(PointF::New());
-  point->x = input.x();
-  point->y = input.y();
-  return point;
-}
-
-// static
-gfx::PointF TypeConverter<gfx::PointF, PointFPtr>::Convert(
-    const PointFPtr& input) {
-  if (input.is_null())
-    return gfx::PointF();
-  return gfx::PointF(input->x, input->y);
-}
-
-// static
-SizePtr TypeConverter<SizePtr, gfx::Size>::Convert(const gfx::Size& input) {
-  SizePtr size(Size::New());
-  size->width = input.width();
-  size->height = input.height();
-  return size;
-}
-
-// static
-gfx::Size TypeConverter<gfx::Size, SizePtr>::Convert(const SizePtr& input) {
-  if (input.is_null())
-    return gfx::Size();
-  return gfx::Size(input->width, input->height);
-}
-
-// static
-RectPtr TypeConverter<RectPtr, gfx::Rect>::Convert(const gfx::Rect& input) {
-  RectPtr rect(Rect::New());
-  rect->x = input.x();
-  rect->y = input.y();
-  rect->width = input.width();
-  rect->height = input.height();
-  return rect;
-}
-
-// static
-gfx::Rect TypeConverter<gfx::Rect, RectPtr>::Convert(const RectPtr& input) {
-  if (input.is_null())
-    return gfx::Rect();
-  return gfx::Rect(input->x, input->y, input->width, input->height);
-}
-
-// static
-RectFPtr TypeConverter<RectFPtr, gfx::RectF>::Convert(const gfx::RectF& input) {
-  RectFPtr rect(RectF::New());
-  rect->x = input.x();
-  rect->y = input.y();
-  rect->width = input.width();
-  rect->height = input.height();
-  return rect;
-}
-
-// static
-gfx::RectF TypeConverter<gfx::RectF, RectFPtr>::Convert(const RectFPtr& input) {
-  if (input.is_null())
-    return gfx::RectF();
-  return gfx::RectF(input->x, input->y, input->width, input->height);
-}
-
-// static
-Rect TypeConverter<Rect, gfx::Rect>::Convert(const gfx::Rect& input) {
-  Rect rect;
-  rect.x = input.x();
-  rect.y = input.y();
-  rect.width = input.width();
-  rect.height = input.height();
-  return rect;
-}
-
-// static
-gfx::Rect TypeConverter<gfx::Rect, Rect>::Convert(const Rect& input) {
-  return gfx::Rect(input.x, input.y, input.width, input.height);
-}
-
-// static
-Size TypeConverter<Size, gfx::Size>::Convert(const gfx::Size& input) {
-  Size size;
-  size.width = input.width();
-  size.height = input.height();
-  return size;
-}
-
-// static
-gfx::Size TypeConverter<gfx::Size, Size>::Convert(const Size& input) {
-  return gfx::Size(input.width, input.height);
-}
-
-// static
-Insets TypeConverter<Insets, gfx::Insets>::Convert(const gfx::Insets& input) {
-  Insets insets;
-  insets.top = input.top();
-  insets.left = input.left();
-  insets.bottom = input.bottom();
-  insets.right = input.right();
-  return insets;
-}
-
-// static
-gfx::Insets TypeConverter<gfx::Insets, Insets>::Convert(const Insets& input) {
-  return gfx::Insets(input.top, input.left, input.bottom, input.right);
-}
-
-// static
-InsetsPtr TypeConverter<InsetsPtr, gfx::Insets>::Convert(
-    const gfx::Insets& input) {
-  InsetsPtr insets(Insets::New());
-  insets->top = input.top();
-  insets->left = input.left();
-  insets->bottom = input.bottom();
-  insets->right = input.right();
-  return insets;
-}
-
-// static
-gfx::Insets TypeConverter<gfx::Insets, InsetsPtr>::Convert(
-    const InsetsPtr& input) {
-  if (input.is_null())
-    return gfx::Insets();
-
-  return gfx::Insets(input->top, input->left, input->bottom, input->right);
-}
-
-}  // namespace mojo