Restructure public side of geometry service.

examples/bitmap_uploader/BUILD.gn

 # 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.
 
 source_set("bitmap_uploader") {
   sources = [
     "bitmap_uploader.cc",
     "bitmap_uploader.h",
   ]
 
   public_deps = [
     "//base",
     "//mojo/public/c/gles2",
     "//mojo/services/public/interfaces/gpu",
     "//mojo/services/surfaces/public/interfaces",
   ]
   deps = [
     "//mojo/application",
     "//mojo/public/cpp/bindings:bindings",
     "//mojo/public/interfaces/application",
-    "//mojo/services/public/cpp/geometry",
-    "//mojo/services/public/interfaces/geometry",
+    "//mojo/services/geometry/public/cpp",
+    "//mojo/services/geometry/public/interfaces",
     "//mojo/services/public/interfaces/input_events:input_events",
     "//mojo/services/surfaces/public/cpp",
     "//mojo/services/surfaces/public/interfaces:surface_id",
     "//mojo/services/view_manager/public/cpp",
     "//mojo/services/view_manager/public/interfaces",
     "//ui/gfx/geometry",
   ]
 }