Move NativeViewport service into view_manager. This is a file move only. Further merging will happe…

mojo/runner/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/generate_mojo_shell_assets_list.gni")
 import("//third_party/mojo/src/mojo/public/mojo.gni")
 import("//third_party/mojo/src/mojo/public/mojo_application.gni")
 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
 import("//testing/test.gni")
@@ skipping 39 matching lines @@
   } else {
     sources += [
       "android/context_init.h",
       "android/library_loader.cc",
       "android/main.cc",
       "android/main.h",
     ]
 
     deps += [
       ":jni_headers",
-      "//components/native_viewport:lib",
+      "//components/view_manager/native_viewport:lib",
       "//mojo/shell",
       "//ui/gl",
     ]
   }
 }
 
 executable("mojo_runner") {
   deps = [
     ":mojo_runner_lib",
   ]
@@ skipping 83 matching lines @@
       "android/native_viewport_application_loader.cc",
       "android/native_viewport_application_loader.h",
       "android/ui_application_loader_android.cc",
       "android/ui_application_loader_android.h",
     ]
 
     deps += [
       ":jni_headers",
       ":run_android_application_function",
       "//components/gles2",
-      "//components/native_viewport:lib",
+      "//components/view_manager/native_viewport:lib",
       "//mojo/application:content_handler",
     ]
   }
 
   # 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.
@@ skipping 150 matching lines @@
 
     native_libs = [ "libmojo_runner.so" ]
 
     asset_location = mojo_runner_assets_dir
 
     deps = [
       ":build_mojo_runner_assets",
       ":java",
       ":resources",
       "//base:base_java",
-      "//components/native_viewport:native_viewport_java",
+      "//components/view_manager/native_viewport:native_viewport_java",
       "//third_party/android_tools:google_play_services_default_resources",
     ]
   }
 
   generate_mojo_shell_assets_list("build_mojo_runner_test_assets") {
     deps = [
       ":copy_mojo_runner_test_assets",
     ]
     dir = mojo_runner_test_assets_dir
   }
@@ skipping 91 matching lines @@
     #"//mojo/services/http_server/public/interfaces",
     "//mojo/services/network/public/interfaces",
 
     "//third_party/mojo/src/mojo/public/cpp/bindings:callback",
     "//third_party/mojo/src/mojo/public/cpp/environment",
     "//third_party/mojo/src/mojo/public/cpp/system:system",
   ]
 
   #data_deps = [ "//services/http_server:http_server($default_toolchain)" ]
 }