Changes view manager test to connect via shell

mojo/mojo.gyp

Index: mojo/mojo.gyp
diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
index ddf77f7ccdd4d3d704d64b3ad9c12be490436152..c20976cfdc7212bebc83b5d703572dd58f087e41 100644
--- a/mojo/mojo.gyp
+++ b/mojo/mojo.gyp
@@ -438,6 +438,7 @@
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_static',
+        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../net/net.gyp:net',
         '../url/url.gyp:url_lib',
         'mojo_external_service_bindings',
@@ -447,6 +448,11 @@
         'mojo_system_impl',
         'mojo_native_viewport_service',
         'mojo_spy',
+
+        # These are only necessary as long as we hard code use of ViewManager.
+        '../skia/skia.gyp:skia',
+        'mojo_shell_client',
+        'mojo_view_manager',
       ],
       'variables': {
         'mojom_base_output_dir': 'mojo',
@@ -504,6 +510,22 @@
       ],
     },
     {
+      'target_name': 'mojo_shell_test_support',
+      'type': 'static_library',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../base/base.gyp:base_static',
+        '../url/url.gyp:url_lib',
+        'mojo_service_manager',
+        'mojo_shell_lib',
+        'mojo_system_impl',
+      ],
+      'sources': [
+        'shell/shell_test_helper.cc',
+        'shell/shell_test_helper.h',
+      ],
+    },
+    {
       'target_name': 'mojo_shell',
       'type': 'executable',
       'dependencies': [