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

shell/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("//build/config/ui.gni")
 import("//mojo/public/mojo.gni")
 import("//mojo/public/mojo_application.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 import("//mojo/tools/embed/rules.gni")
 import("//testing/test.gni")
@@ skipping 217 matching lines @@
       "android/ui_application_loader_android.h",
       "android/url_response_disk_cache_delegate_impl.cc",
       "android/url_response_disk_cache_delegate_impl.h",
     ]
 
     deps += [
       ":jni_headers",
       ":run_android_application_function",
       "//mojo/application:content_handler",
       "//mojo/services/content_handler/interfaces",
-      "//mojo/services/gpu/public/interfaces",
-      "//mojo/services/native_viewport/public/interfaces",
+      "//mojo/services/gpu/interfaces",
+      "//mojo/services/native_viewport/interfaces",
       "//services/gles2",
       "//services/native_viewport:lib",
     ]
   }
 
   if (is_mac) {
     sources -= [
       "url_response_disk_cache_loader.cc",
       "url_response_disk_cache_loader.h",
     ]
@@ skipping 97 matching lines @@
     ]
 
     deps = [
       ":resources",
       "//base:base_java",
       "//mojo/android:system_java",
       "//mojo/public/interfaces/application:application_java",
       "//mojo/public/java:application",
       "//mojo/public/java:bindings",
       "//mojo/public/java:system",
-      "//mojo/services/keyboard/public/interfaces:interfaces_java",
+      "//mojo/services/keyboard/interfaces:interfaces_java",
       "//services/authentication",
       "//services/location",
       "//services/intent_receiver:bindings_java",
       "//services/native_viewport:interfaces_java",
       "//services/nfc_message_sink:bindings_java",
       "//services/sharing_sink:bindings_java",
       "//mojo/services/nfc/public/interfaces:interfaces_java",
       "//services/keyboard",
       "//services/native_viewport:native_viewport_java",
     ]
@@ skipping 262 matching lines @@
   ]
 
   deps = [
     "//base",
     "//mojo/application",
     "//mojo/application:test_support",
     "//mojo/data_pipe_utils",
     "//mojo/public/cpp/bindings:callback",
     "//mojo/public/cpp/environment",
     "//mojo/public/cpp/system:system",
-    "//mojo/services/http_server/public/cpp",
-    "//mojo/services/http_server/public/interfaces",
+    "//mojo/services/http_server/cpp",
+    "//mojo/services/http_server/interfaces",
     "//mojo/services/network/public/interfaces",
     "//shell/test:bindings",
     ":embed_pingable",
   ]
 
   data_deps = [ "//services/http_server:http_server($default_toolchain)" ]
 }
 
 mojo_native_application("shell_nfc_apptests") {
   output_name = "shell_nfc_apptests"
@@ skipping 37 matching lines @@
       "${root_out_dir}/libmojo_shell.so",
     ]
   } else {
     sources += [ "${root_out_dir}/mojo_shell" ]
   }
 
   outputs = [
     "${root_out_dir}/symbols/{{source_file_part}}",
   ]
 }