4th attempt to land change to remove NativeViewportService and

mojo/mojo_services.gypi

Index: mojo/mojo_services.gypi
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi
index 4b686114eadae0a21885a37b73618063ca357c28..109cfd3074650e9beb7a452a792bbb5ba9619ae9 100644
--- a/mojo/mojo_services.gypi
+++ b/mojo/mojo_services.gypi
@@ -328,8 +328,6 @@
     {
       # GN version: //mojo/services/native_viewport
       'target_name': 'mojo_native_viewport_service_lib',
-      # This is linked directly into the embedder, so we make it a static_library.
-      # TODO(davemoore): Make this a true service.
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
@@ -400,6 +398,21 @@
       ],
     },
     {
+      'target_name': 'mojo_native_viewport_service',
+      'type': 'loadable_module',
+      'dependencies': [
+        'mojo_native_viewport_bindings',
+        'mojo_native_viewport_service_lib',
+        '<(mojo_system_for_loadable_module)',
+      ],
+      'export_dependent_settings': [
+        'mojo_native_viewport_bindings',
+      ],
+      'sources': [
+        'services/native_viewport/main.cc',
+      ],
+    },
+    {
       # GN version: //mojo/services/public/interfaces/navigation
       'target_name': 'mojo_navigation_bindings',
       'type': 'static_library',
@@ -761,7 +774,7 @@
         {
           # GN version: //mojo/services/view_manager
           'target_name': 'mojo_view_manager',
-          'type': '<(component)',
+          'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
             '../cc/cc.gyp:cc_surfaces',
@@ -771,6 +784,8 @@
             '../ui/events/events.gyp:events_base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
+            '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
+            'mojo_base.gyp:mojo_common_lib',
             'mojo_base.gyp:mojo_application_chromium',
             'mojo_base.gyp:mojo_common_lib',
             'mojo_geometry_bindings',
@@ -783,7 +798,8 @@
             'mojo_surfaces_lib',
             'mojo_view_manager_bindings',
             'mojo_view_manager_common',
-            '<(mojo_system_for_component)',
+            'mojo_gpu_bindings',
+            '<(mojo_system_for_loadable_module)',
           ],
           'sources': [
             'services/view_manager/access_policy.h',
@@ -809,6 +825,9 @@
             'services/view_manager/window_manager_access_policy.cc',
             'services/view_manager/window_manager_access_policy.h',
           ],
+          'includes': [
+            'mojo_public_gles2_for_loadable_module.gypi',
+          ],
           'defines': [
             'MOJO_VIEW_MANAGER_IMPLEMENTATION',
           ],
@@ -820,7 +839,6 @@
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
-            '../ui/gl/gl.gyp:gl',
           ],
           'sources': [
             'services/public/cpp/view_manager/lib/view_manager_test_suite.cc',
@@ -828,12 +846,6 @@
             'services/public/cpp/view_manager/lib/view_manager_unittests.cc',
           ],
           'conditions': [
-            ['OS=="linux" or OS=="win"', {
-              'dependencies': [
-                '../third_party/mesa/mesa.gyp:osmesa',
-                'mojo_native_viewport_service_lib',
-              ],
-            }],
             ['use_x11==1', {
               'dependencies': [
                 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
@@ -852,7 +864,6 @@
             '../testing/gtest.gyp:gtest',
             '../ui/aura/aura.gyp:aura',
             '../ui/gfx/gfx.gyp:gfx_geometry',
-            '../ui/gl/gl.gyp:gl',
             'mojo_application_manager',
             'mojo_base.gyp:mojo_system_impl',
             'mojo_base.gyp:mojo_application_chromium',
@@ -864,12 +875,23 @@
             'mojo_view_manager_bindings',
             'mojo_view_manager_common',
             'mojo_view_manager_run_unittests',
+            # Included only to force deps for bots.
+            'mojo_native_viewport_service',
+            'mojo_surfaces_service',
+            'mojo_view_manager',
           ],
           'sources': [
             'services/view_manager/test_change_tracker.cc',
             'services/view_manager/test_change_tracker.h',
             'services/view_manager/view_manager_unittest.cc',
           ],
+          'conditions': [
+             ['OS=="win"', {
+               'dependencies': [
+                 '../ui/gfx/gfx.gyp:gfx',
+               ],
+             }],
+           ],
         },
         {
           'target_name': 'package_mojo_view_manager',
@@ -921,7 +943,6 @@
           'dependencies': [
             '../base/base.gyp:test_support_base',
             '../testing/gtest.gyp:gtest',
-            '../ui/gl/gl.gyp:gl',
             'mojo_application_manager',
             'mojo_base.gyp:mojo_system_impl',
             'mojo_base.gyp:mojo_environment_chromium',