Move //mojo/services/X/public/... to //mojo/services/X/... (part 2).

mojo/gpu/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.
 
 import("//mojo/public/mojo_application.gni")
 
 source_set("gpu") {
   sources = [
     "gl_context.cc",
     "gl_context.h",
@@ skipping 21 matching lines @@
     "//gpu/command_buffer/common",
     "//mojo/environment:chromium",
     "//mojo/public/c/gpu:gpu_onscreen",
     "//mojo/public/c/system",
     "//mojo/public/cpp/application",
     "//mojo/public/cpp/bindings",
     "//mojo/public/cpp/environment",
     "//mojo/public/cpp/system",
     "//mojo/public/cpp/utility",
     "//mojo/public/interfaces/application",
-    "//mojo/services/geometry/public/cpp",
-    "//mojo/services/geometry/public/interfaces",
-    "//mojo/services/gpu/public/interfaces",
+    "//mojo/services/geometry/cpp",
+    "//mojo/services/geometry/interfaces",
+    "//mojo/services/gpu/interfaces",
     "//mojo/services/surfaces/public/cpp",
     "//mojo/services/surfaces/public/interfaces",
     "//mojo/services/surfaces/public/interfaces:surface_id",
   ]
 }
 
 mojo_native_application("apptests") {
   output_name = "texture_apptests"
 
   testonly = true
 
   sources = [
     "texture_cache_unittest.cc",
     "texture_uploader_unittest.cc",
   ]
 
   deps = [
     ":gpu",
     "//base",
     "//mojo/application",
     "//mojo/application:test_support",
     "//mojo/public/cpp/bindings:callback",
-    "//mojo/services/geometry/public/interfaces",
+    "//mojo/services/geometry/interfaces",
     "//mojo/services/surfaces/public/interfaces:surface_id",
     "//testing/gtest",
   ]
 }