Move native_viewport and gles2 service impls to //services

mojo/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/tools/bindings/mojom.gni")
 
 # We don't support building in the component build since mojo apps are
 # inherently components.
@@ skipping 146 matching lines @@
       "android/android_handler.h",
       "android/android_handler.cc",
       "android/android_handler_loader.h",
       "android/android_handler_loader.cc",
       "network_application_loader.cc",
       "network_application_loader.h",
     ]
 
     deps += [
       ":jni_headers",
-      "//mojo/services/gles2",
-      "//mojo/services/native_viewport:lib",
       "//mojo/services/network:lib",
       "//mojo/application:content_handler",
+      "//services/gles2",
+      "//services/native_viewport:lib",
     ]
   }
 
   # This target includes some files behind #ifdef OS... guards. Since gn is not
   # smart enough to understand preprocess includes, it does complains about
   # these includes when not using the build files for that OS. Suppress checking
   # so we can enable checking for the rest of the targets in this file.
   # TODO: Might be better to split the files with OS-specific includes out to a
   # separate source_set so we can leave checking on for the rest of the target.
   check_includes = false
@@ skipping 56 matching lines @@
   shared_library("libmojo_shell") {
     sources = [
       "android/library_loader.cc",
       "android/mojo_main.cc",
       "android/mojo_main.h",
     ]
     deps = [
       ":jni_headers",
       ":lib",
       "//mojo/application_manager",
-      "//mojo/services/native_viewport:lib",
       "//net",
+      "//services/native_viewport:lib",
       "//ui/gl",
     ]
   }
 
   mojo_shell_assets_dir = "$root_build_dir/mojo_shell_assets"
 
   copy_ex("copy_mojo_shell_assets") {
     clear_dir = true
     dest = mojo_shell_assets_dir
     sources = [
@@ skipping 11 matching lines @@
       "libmojo_shell.so",
     ]
 
     asset_location = mojo_shell_assets_dir
 
     deps = [
       ":copy_mojo_shell_assets",
       ":java",
       ":libmojo_shell",
       ":resources",
-      "//mojo/services/native_viewport:native_viewport_java",
+      "//services/native_viewport:native_viewport_java",
     ]
   }
 }
 
 mojom("app_child_process_bindings") {
   sources = [
     "app_child_process.mojom"
   ]
 }
 
@@ skipping 121 matching lines @@
 
     deps -= [
       ":lib",
       ":external_application_registrar_connection",
       ":external_application_registrar_bindings",
       "//mojo/shell/domain_socket",
       "//mojo/shell/domain_socket:tests",
     ]
   }
 }