Restructure public side of geometry service.

mojo/services/geometry/public/cpp/geometry_util.h

Index: mojo/services/geometry/public/cpp/geometry_util.h
diff --git a/mojo/services/public/cpp/geometry/geometry_util.h b/mojo/services/geometry/public/cpp/geometry_util.h
similarity index 77%
rename from mojo/services/public/cpp/geometry/geometry_util.h
rename to mojo/services/geometry/public/cpp/geometry_util.h
index c2386789591311d217f224515efb8353f21bf42d..45a8b4bab6b3832c94d863f6363dc2242999837e 100644
--- a/mojo/services/public/cpp/geometry/geometry_util.h
+++ b/mojo/services/geometry/public/cpp/geometry_util.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef MOJO_SERVICES_PUBLIC_CPP_GEOMETRY_GEOMETRY_UTIL_H_
-#define MOJO_SERVICES_PUBLIC_CPP_GEOMETRY_GEOMETRY_UTIL_H_
+#ifndef MOJO_SERVICES_GEOMETRY_PUBLIC_CPP_GEOMETRY_UTIL_H_
+#define MOJO_SERVICES_GEOMETRY_PUBLIC_CPP_GEOMETRY_UTIL_H_
 
-#include "mojo/services/public/interfaces/geometry/geometry.mojom.h"
+#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
 
 namespace mojo {
 
@@ -36,4 +36,4 @@ inline bool operator!=(const Point& lhs, const Point& rhs) {
 
 }
 
-#endif  // MOJO_SERVICES_PUBLIC_CPP_GEOMETRY_GEOMETRY_UTIL_H_
+#endif  // MOJO_SERVICES_GEOMETRY_PUBLIC_CPP_GEOMETRY_UTIL_H_