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

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 186 matching lines @@
     "//base/third_party/dynamic_annotations",
     "//base:base_static",
     "//mojo/application",
     "//mojo/common",
     "//mojo/common:tracing_impl",
     "//mojo/data_pipe_utils",
     "//mojo/edk/system",
     "//mojo/public/cpp/bindings",
     "//mojo/public/interfaces/application",
     "//mojo/services/network/public/interfaces",
-    "//mojo/services/tracing/public/interfaces",
+    "//mojo/services/tracing/interfaces",
     "//services/url_response_disk_cache",
     "//shell/application_manager",
     "//url",
   ]
 
   public_deps = [
     ":common_lib",
   ]
 
   if (is_android) {
@@ skipping 136 matching lines @@
       "//mojo/public/java:application",
       "//mojo/public/java:bindings",
       "//mojo/public/java:system",
       "//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",
+      "//mojo/services/nfc/interfaces:interfaces_java",
       "//services/keyboard",
       "//services/native_viewport:native_viewport_java",
     ]
   }
 
   if (is_official_build) {
     icon_dir = "android/apk/res-official"
   } else {
     icon_dir = "android/apk/res-dev"
   }
@@ skipping 282 matching lines @@
   ]
 
   deps = [
     "//base",
     "//mojo/application",
     "//mojo/application:test_support",
     "//mojo/common:common",
     "//mojo/public/cpp/bindings:callback",
     "//mojo/public/cpp/environment",
     "//mojo/public/cpp/system:system",
-    "//mojo/services/nfc/public/interfaces",
+    "//mojo/services/nfc/interfaces",
     "//shell/test:bindings",
   ]
 }
 
 copy("copy_symbols") {
   testonly = true
 
   deps = [
     ":mojo_shell",
     ":mojo_shell_child",
@@ skipping 11 matching lines @@
       "${root_out_dir}/libmojo_shell.so",
     ]
   } else {
     sources += [ "${root_out_dir}/mojo_shell" ]
   }
 
   outputs = [
     "${root_out_dir}/symbols/{{source_file_part}}",
   ]
 }