Revert of Second attempt to land change to remove NativeViewportService and

mojo/services/native_viewport/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")
 
-if (!is_android) {
-  shared_library("native_viewport") {
-    output_name = "mojo_native_viewport_service"
+# GYP version: mojo/mojo_services.gypi:mojo_native_viewport_service_lib
+static_library("native_viewport") {
+  output_name = "mojo_native_viewport"
 
-    deps = [
-      ":lib",
-      "//mojo/public/c/system:for_shared_library",
-      "//mojo/services/public/interfaces/native_viewport",
-      "//ui/gl",
-    ]
-
-    sources = [ "main.cc" ]
-  }
-}
-
-source_set("lib") {
   deps = [
     "//base",
     "//cc/surfaces",
     "//mojo/application",
     "//mojo/common",
     "//mojo/environment:chromium",
     "//mojo/services/gles2",
     "//mojo/services/public/cpp/geometry",
     "//mojo/services/public/cpp/input_events",
     "//mojo/services/public/cpp/surfaces",
     "//mojo/services/public/interfaces/geometry",
     "//mojo/services/public/interfaces/native_viewport",
     "//mojo/services/public/interfaces/surfaces",
     "//ui/events",
     "//ui/events/platform",
     "//ui/gfx",
     "//ui/gfx/geometry",
-    "//ui/gl",
   ]
 
   sources = [
     "gpu_impl.cc",
     "gpu_impl.h",
     "native_viewport_impl.cc",
     "native_viewport_impl.h",
     "platform_viewport.h",
     "platform_viewport_android.cc",
     "platform_viewport_android.h",
     "platform_viewport_mac.mm",
     "platform_viewport_win.cc",
     "viewport_surface.cc",
     "viewport_surface.h",
   ]
 
   if (is_ios) {
     sources += [ "platform_viewport_stub.cc" ]
   }
 
   if (is_android) {
     deps += [ "//mojo:jni_headers" ]
   }
 
+  if (is_win) {
+    deps += [
+      # TODO(GYP)
+      # '../ui/platform_window/win/win_window.gyp:win_window',
+    ]
+  }
+
   if (use_x11) {
     sources += [ "platform_viewport_x11.cc" ]
     deps += [
       "//ui/events/platform/x11",
       "//ui/platform_window/x11",
     ]
   }
 
   if (use_ozone) {
     sources += [ "platform_viewport_ozone.cc" ]
   }
 }