Change mojo geometry structs from using type converters to StructTraits.

components/mus/ws/event_matcher.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 "components/mus/ws/event_matcher.h"
 
 #include "ui/events/mojo/input_events_type_converters.h"
-#include "ui/gfx/geometry/mojo/geometry_type_converters.h"
 
 namespace mus {
 namespace ws {
 
 EventMatcher::EventMatcher(const mojom::EventMatcher& matcher)
     : fields_to_match_(NONE),
       event_type_(ui::ET_UNKNOWN),
       event_flags_(ui::EF_NONE),
       ignore_event_flags_(ui::EF_NONE),
       keyboard_code_(ui::VKEY_UNKNOWN),
@@ skipping 44 matching lines @@
         break;
       case mojom::PointerKind::TOUCH:
         pointer_type_ = ui::EventPointerType::POINTER_TYPE_TOUCH;
         break;
       default:
         NOTREACHED();
     }
   }
   if (matcher.pointer_location_matcher) {
     fields_to_match_ |= POINTER_LOCATION;
-    pointer_region_ = matcher.pointer_location_matcher->region.To<gfx::RectF>();
+    pointer_region_ = matcher.pointer_location_matcher->region;
   }
 }
 
 EventMatcher::~EventMatcher() {}
 
 bool EventMatcher::MatchesEvent(const ui::Event& event) const {
   if ((fields_to_match_ & TYPE) && event.type() != event_type_)
     return false;
   int flags = event.flags() & ~ignore_event_flags_;
   if ((fields_to_match_ & FLAGS) && flags != event_flags_)
@@ skipping 23 matching lines @@
          event_type_ == other.event_type_ &&
          event_flags_ == other.event_flags_ &&
          ignore_event_flags_ == other.ignore_event_flags_ &&
          keyboard_code_ == other.keyboard_code_ &&
          pointer_type_ == other.pointer_type_ &&
          pointer_region_ == other.pointer_region_;
 }
 
 }  // namespace ws
 }  // namespace mus