Change mojo geometry structs from using type converters to StructTraits.

ui/views/mus/screen_mus.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 "ui/views/mus/screen_mus.h"
 
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/connector.h"
 #include "ui/aura/window.h"
 #include "ui/display/display_finder.h"
 #include "ui/display/display_observer.h"
 #include "ui/display/mojo/display_type_converters.h"
-#include "ui/gfx/geometry/mojo/geometry_type_converters.h"
 #include "ui/views/mus/screen_mus_delegate.h"
 #include "ui/views/mus/window_manager_frame_values.h"
 
 #ifdef NOTIMPLEMENTED
 #undef NOTIMPLEMENTED
 #define NOTIMPLEMENTED() DVLOG(1) << "notimplemented"
 #endif
 
 namespace mojo {
 
 template <>
 struct TypeConverter<views::WindowManagerFrameValues,
                      mus::mojom::FrameDecorationValuesPtr> {
   static views::WindowManagerFrameValues Convert(
       const mus::mojom::FrameDecorationValuesPtr& input) {
     views::WindowManagerFrameValues result;
-    result.normal_insets = input->normal_client_area_insets.To<gfx::Insets>();
-    result.maximized_insets =
-        input->maximized_client_area_insets.To<gfx::Insets>();
+    result.normal_insets = input->normal_client_area_insets;
+    result.maximized_insets = input->maximized_client_area_insets;
     result.max_title_bar_button_width = input->max_title_bar_button_width;
     return result;
   }
 };
 
 }  // namespace mojo
 
 namespace views {
 
 ScreenMus::ScreenMus(ScreenMusDelegate* delegate)
@@ skipping 144 matching lines @@
         delegate_->OnWindowManagerFrameValuesChanged();
     }
   }
 }
 
 void ScreenMus::OnDisplayRemoved(int64_t id) {
   display_list_.RemoveDisplay(id);
 }
 
 }  // namespace views