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

apps/moterm/BUILD.gn

 # Copyright 2015 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")
 
 mojo_native_application("moterm") {
   sources = [
     "moterm_main.cc",
     "moterm_view.cc",
@@ skipping 23 matching lines @@
 
 mojo_native_application("gl_helper_test_app") {
   sources = [
     "gl_helper_test_app.cc",
   ]
 
   deps = [
     ":gl_helper",
     "//base",
     "//mojo/application",
-    "//mojo/services/geometry/public/interfaces",
-    "//mojo/services/gpu/public/interfaces",
-    "//mojo/services/native_viewport/public/interfaces",
+    "//mojo/services/geometry/interfaces",
+    "//mojo/services/gpu/interfaces",
+    "//mojo/services/native_viewport/interfaces",
     "//mojo/services/surfaces/public/interfaces",
   ]
 }
 
 source_set("driver") {
   sources = [
     "moterm_driver.cc",
     "moterm_driver.h",
   ]
 
   public_deps = [
     "//base",
     "//mojo/public/cpp/bindings",
     "//mojo/services/files/interfaces",
   ]
 }
 
 source_set("gl_helper") {
   sources = [
     "gl_helper.cc",
     "gl_helper.h",
   ]
 
   deps = [
     "//mojo/public/cpp/application",
     "//mojo/public/c/gpu",
     "//mojo/public/interfaces/application",
-    "//mojo/services/gpu/public/interfaces",
+    "//mojo/services/gpu/interfaces",
     "//mojo/services/surfaces/public/interfaces",
   ]
 
   forward_dependent_configs_from = [
     "//mojo/public/c/gpu",
-    "//mojo/services/gpu/public/interfaces",
+    "//mojo/services/gpu/interfaces",
     "//mojo/services/surfaces/public/interfaces",
   ]
 
   public_deps = [
     "//base",
     "//mojo/public/c/gpu:GLES2",
-    "//mojo/services/geometry/public/cpp",
-    "//mojo/services/geometry/public/interfaces",
+    "//mojo/services/geometry/cpp",
+    "//mojo/services/geometry/interfaces",
     "//mojo/services/surfaces/public/cpp",
     "//mojo/services/surfaces/public/interfaces:surface_id",
   ]
 }
 
 source_set("key_util") {
   sources = [
     "key_util.cc",
     "key_util.h",
   ]
 
   deps = [
     "//base",
   ]
 
   public_deps = [
-    "//mojo/services/input_events/public/interfaces",
+    "//mojo/services/input_events/interfaces",
   ]
 }
 
 source_set("model") {
   sources = [
     "moterm_model.cc",
     "moterm_model.h",
   ]
 
   deps = [
@@ skipping 23 matching lines @@
     ":driver",
     ":gl_helper",
     ":key_util",
     ":model",
     "//mojo/application",
     "//mojo/application:test_support",
     "//mojo/public/cpp/bindings:callback",
     "//testing/gtest",
   ]
 }