Revert "Move geometry to mojo/services, extract input events to their own mojom"

mojo/geometry/geometry_type_converters.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 "mojo/services/public/cpp/geometry/geometry_type_converters.h"
+#include "mojo/geometry/geometry_type_converters.h"
 
 namespace mojo {
 
 // static
 Point TypeConverter<Point, gfx::Point>::ConvertFrom(const gfx::Point& input,
                                                     Buffer* buf) {
   Point::Builder point(buf);
   point.set_x(input.x());
   point.set_y(input.y());
   return point.Finish();
@@ skipping 27 matching lines @@
   return rect.Finish();
 }
 
 // static
 gfx::Rect TypeConverter<Rect, gfx::Rect>::ConvertTo(const Rect& input) {
   return gfx::Rect(input.position().x(), input.position().y(),
                     input.size().width(), input.size().height());
 }
 
 }  // namespace mojo