GN: Build rules and fixes for (almost) all mojo unittest targets

mojo/mojo_public_tests.gypi

Index: mojo/mojo_public_tests.gypi
diff --git a/mojo/mojo_public_tests.gypi b/mojo/mojo_public_tests.gypi
index e8a706750ac8eec3a646e76816002d380af62d54..0ca652472c5a758aba1c2ca38bda03b5b6b26368 100644
--- a/mojo/mojo_public_tests.gypi
+++ b/mojo/mojo_public_tests.gypi
@@ -5,6 +5,7 @@
 {
   'targets': [
     {
+      # GN version: //mojo/public/c/test_support
       'target_name': 'mojo_test_support',
       'type': 'shared_library',
       'defines': [
@@ -21,6 +22,7 @@
       'sources': [
         'public/c/test_support/test_support.h',
         'public/c/test_support/test_support_export.h',
+        # TODO(vtl): Convert this to thunks http://crbug.com/386799
         'public/tests/test_support_private.cc',
         'public/tests/test_support_private.h',
       ],
@@ -34,6 +36,7 @@
       ],
     },
     {
+      # GN version: //mojo/public/cpp/test_support:test_utils
       'target_name': 'mojo_public_test_utils',
       'type': 'static_library',
       'dependencies': [
@@ -49,6 +52,7 @@
     },
     # TODO(vtl): Reorganize the mojo_public_*_unittests.
     {
+      # GN version: //mojo/public/cpp/bindings/tests:mojo_public_bindings_unittests
       'target_name': 'mojo_public_bindings_unittests',
       'type': 'executable',
       'dependencies': [
@@ -80,16 +84,17 @@
       ],
     },
     {
+      # GN version: //mojo/public/cpp/environment/tests:mojo_public_environment_unittests
       'target_name': 'mojo_public_environment_unittests',
       'type': 'executable',
       'dependencies': [
-        '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
         'mojo_environment_standalone',
         'mojo_public_test_utils',
         'mojo_run_all_unittests',
         'mojo_utility',
       ],
+      'include_dirs': [ '..' ],
       'sources': [
         'public/cpp/environment/tests/async_waiter_unittest.cc',
         'public/cpp/environment/tests/logger_unittest.cc',
@@ -97,6 +102,7 @@
       ],
     },
     {
+      # GN version: //mojo/public/cpp/application/tests:mojo_public_application_unittests
       'target_name': 'mojo_public_application_unittests',
       'type': 'executable',
       'dependencies': [
@@ -112,15 +118,15 @@
       ],
     },
     {
+      # GN version: //mojo/public/cpp/application/tests:mojo_public_system_unittests
       'target_name': 'mojo_public_system_unittests',
       'type': 'executable',
       'dependencies': [
-        '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
-        'mojo_cpp_bindings',
         'mojo_public_test_utils',
         'mojo_run_all_unittests',
       ],
+      'include_dirs': [ '..' ],
       'sources': [
         'public/c/system/tests/core_unittest.cc',
         'public/c/system/tests/core_unittest_pure_c.c',
@@ -130,16 +136,16 @@
       ],
     },
     {
+      # GN version: //mojo/public/cpp/application/tests:mojo_public_utility_unittests
       'target_name': 'mojo_public_utility_unittests',
       'type': 'executable',
       'dependencies': [
-        '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
-        'mojo_cpp_bindings',
         'mojo_public_test_utils',
         'mojo_run_all_unittests',
         'mojo_utility',
       ],
+      'include_dirs' : [ '..' ],
       'sources': [
         'public/cpp/utility/tests/mutex_unittest.cc',
         'public/cpp/utility/tests/run_loop_unittest.cc',
@@ -170,6 +176,7 @@
       ],
     },
     {
+      # GN version: //mojo/public/interfaces/bindings/tests:test_interfaces
       'target_name': 'mojo_public_test_interfaces',
       'type': 'static_library',
       'sources': [
@@ -192,6 +199,7 @@
       ],
     },
     {
+      # GN version: //mojo/public/js/bindings/tests:mojo_js_unittests
       'target_name': 'mojo_js_unittests',
       'type': 'executable',
       'dependencies': [