Mojo: re-organize public tests

mojo/mojo_public.gypi

Index: mojo/mojo_public.gypi
diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi
index 2a106f60fa8605ab511b8cf7cd6e950b93c52e67..488f373b67137ca1a4f86d866d20bcc30dbdd33b 100644
--- a/mojo/mojo_public.gypi
+++ b/mojo/mojo_public.gypi
@@ -32,39 +32,73 @@
         'mojo_system',
       ],
       'sources': [
-        'public/tests/simple_bindings_support.cc',
-        'public/tests/simple_bindings_support.h',
         'public/tests/test_support.cc',
         'public/tests/test_support.h',
       ],
     },
     {
-      'target_name': 'mojo_public_unittests',
+      'target_name': 'mojo_public_bindings_unittests',
       'type': 'executable',
       'dependencies': [
         '../testing/gtest.gyp:gtest',
         'mojo_bindings',
         'mojo_public_test_support',
         'mojo_run_all_unittests',
+        'mojo_sample_service',
         'mojo_system',
       ],
       'sources': [
-        'public/tests/bindings_array_unittest.cc',
-        'public/tests/bindings_connector_unittest.cc',
-        'public/tests/bindings_handle_passing_unittest.cc',
-        'public/tests/bindings_remote_ptr_unittest.cc',
-        'public/tests/bindings_type_conversion_unittest.cc',
-        'public/tests/buffer_unittest.cc',
-        'public/tests/math_calculator.mojom',
-        'public/tests/sample_factory.mojom',
-        'public/tests/system_core_cpp_unittest.cc',
-        'public/tests/system_core_unittest.cc',
-        'public/tests/test_structs.mojom',
+        'public/tests/bindings/array_unittest.cc',
+        'public/tests/bindings/connector_unittest.cc',
+        'public/tests/bindings/handle_passing_unittest.cc',
+        'public/tests/bindings/remote_ptr_unittest.cc',
+        'public/tests/bindings/type_conversion_unittest.cc',
+        'public/tests/bindings/buffer_unittest.cc',
+        'public/tests/bindings/math_calculator.mojom',
+        'public/tests/bindings/sample_factory.mojom',
+        'public/tests/bindings/sample_service_unittests.cc',
+        'public/tests/bindings/simple_bindings_support.cc',
+        'public/tests/bindings/simple_bindings_support.h',
+        'public/tests/bindings/test_structs.mojom',
       ],
       'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
     },
     {
-      'target_name': 'mojo_public_perftests',
+      'target_name': 'mojo_public_system_unittests',
+      'type': 'executable',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../testing/gtest.gyp:gtest',
+        'mojo_bindings',
+        'mojo_public_test_support',
+        'mojo_run_all_unittests',
+        'mojo_system',
+      ],
+      'sources': [
+        'public/tests/system/core_cpp_unittest.cc',
+        'public/tests/system/core_unittest.cc',
+      ],
+    },
+    {
+      'target_name': 'mojo_public_utility_unittests',
+      'type': 'executable',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../testing/gtest.gyp:gtest',
+        'mojo_bindings',
+        'mojo_public_test_support',
+        'mojo_run_all_unittests',
+        'mojo_system',
+        'mojo_utility',
+      ],
+      'sources': [
+        'public/tests/utility/bindings_support_impl_unittest.cc',
+        'public/tests/utility/run_loop_unittest.cc',
+        'public/tests/utility/thread_local_unittest.cc',
+      ],
+    },
+    {
+      'target_name': 'mojo_public_system_perftests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
@@ -74,7 +108,7 @@
         'mojo_system',
       ],
       'sources': [
-        'public/tests/system_core_perftest.cc',
+        'public/tests/system/core_perftest.cc',
       ],
     },
     {
@@ -110,7 +144,7 @@
       'target_name': 'mojo_sample_service',
       'type': 'static_library',
       'sources': [
-        'public/bindings/sample/sample_service.mojom',
+        'public/tests/bindings/sample_service.mojom',
       ],
       'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
       'export_dependent_settings': [
@@ -119,19 +153,6 @@
       ],
     },
     {
-      'target_name': 'mojo_bindings_unittests',
-      'type': 'executable',
-      'sources': [
-        'public/bindings/sample/sample_service_unittests.cc',
-      ],
-      'dependencies': [
-        '../testing/gtest.gyp:gtest',
-        'mojo_public_test_support',
-        'mojo_run_all_unittests',
-        'mojo_sample_service',
-      ],
-    },
-    {
       'target_name': 'mojo_utility',
       'type': 'static_library',
       'sources': [
@@ -150,23 +171,5 @@
         '..',
       ],
     },
-    {
-      'target_name': 'mojo_utility_unittests',
-      'type': 'executable',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../testing/gtest.gyp:gtest',
-        'mojo_bindings',
-        'mojo_public_test_support',
-        'mojo_run_all_unittests',
-        'mojo_system',
-        'mojo_utility',
-      ],
-      'sources': [
-        'public/utility/bindings_support_impl_unittest.cc',
-        'public/utility/run_loop_unittest.cc',
-        'public/utility/thread_local_unittest.cc',
-      ],
-    },
   ],
 }