Revert of Second 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 a0aef82a393610eedb1016d6adb63e334f26fef4..4b686114eadae0a21885a37b73618063ca357c28 100644
--- a/mojo/mojo_services.gypi
+++ b/mojo/mojo_services.gypi
@@ -328,6 +328,8 @@
     {
       # 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',
@@ -395,21 +397,6 @@
             '../ui/ozone/ozone.gyp:ozone',
           ],
         }],
-      ],
-    },
-    {
-      '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',
       ],
     },
     {
@@ -774,7 +761,7 @@
         {
           # GN version: //mojo/services/view_manager
           'target_name': 'mojo_view_manager',
-          'type': 'loadable_module',
+          'type': '<(component)',
           'dependencies': [
             '../base/base.gyp:base',
             '../cc/cc.gyp:cc_surfaces',
@@ -784,8 +771,6 @@
             '../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',
@@ -798,8 +783,7 @@
             'mojo_surfaces_lib',
             'mojo_view_manager_bindings',
             'mojo_view_manager_common',
-            'mojo_gpu_bindings',
-            '<(mojo_system_for_loadable_module)',
+            '<(mojo_system_for_component)',
           ],
           'sources': [
             'services/view_manager/access_policy.h',
@@ -825,9 +809,6 @@
             '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',
           ],
@@ -839,6 +820,7 @@
           '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',
@@ -846,6 +828,12 @@
             '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',
@@ -864,6 +852,7 @@
             '../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',
@@ -881,13 +870,6 @@
             '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',
@@ -939,6 +921,7 @@
           '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',