[mojo] Delete third_party/mojo

mojo/mojo_edk_tests.gyp

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'includes': [
-    '../third_party/mojo/mojo_variables.gypi',
+    'mojo_variables.gypi',
   ],
   'targets': [
     {
       'target_name': 'mojo_edk_tests',
       'type': 'none',
       'dependencies': [
         # NOTE: If adding a new dependency here, please consider whether it
         # should also be added to the list of Mojo-related dependencies of
         # build/all.gyp:All on iOS, as All cannot depend on the mojo_base
         # target on iOS due to the presence of the js targets, which cause v8
         # to be built.
-        'mojo_message_pipe_perftests2',
-        'mojo_system_unittests2',
+        'mojo_message_pipe_perftests',
+        'mojo_public_bindings_perftests',
+        'mojo_public_bindings_unittests',
+        'mojo_public_environment_unittests',
+        'mojo_public_system_perftests',
+        'mojo_public_system_unittests',
+        'mojo_public_utility_unittests',
+        'mojo_system_unittests',
         'mojo_js_unittests',
         'mojo_js_integration_tests',
       ],
     },
     {
       # GN version: //mojo/edk/system/ports:mojo_system_ports_unittests
       'target_name': 'mojo_system_ports_unittests',
       'type': 'executable',
       'dependencies': [
         '../testing/gtest.gyp:gtest',
         '../testing/gtest.gyp:gtest_main',
-        'mojo_edk.gyp:mojo_system_impl2',
+        'mojo_edk.gyp:mojo_system_impl',
       ],
       'sources': [
         'edk/system/ports/ports_unittest.cc',
       ],
-    }
+    },
     {
-      # GN version: //mojo/edk/system:mojo_system_unittests
-      'target_name': 'mojo_system_unittests2',
+      # GN version: //mojo/edk/test:mojo_public_bindings_unittests
+      'target_name': 'mojo_public_bindings_unittests',
+      'type': 'executable',
+      'dependencies': [
+        '../testing/gtest.gyp:gtest',
+        'mojo_base.gyp:mojo_environment_chromium',
+        'mojo_base.gyp:mojo_message_pump_lib',
+        'mojo_edk.gyp:mojo_run_all_unittests',
+        'mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_public_bindings_test_utils',
+        'mojo_public.gyp:mojo_public_test_associated_interfaces',
+        'mojo_public.gyp:mojo_public_test_interfaces',
+        'mojo_public.gyp:mojo_public_test_interfaces_blink',
+        'mojo_public.gyp:mojo_public_test_interfaces_chromium',
+        'mojo_public.gyp:mojo_public_test_utils',
+        'mojo_public.gyp:mojo_utility',
+      ],
+      'sources': [
+        'public/cpp/bindings/tests/array_unittest.cc',
+        'public/cpp/bindings/tests/associated_interface_unittest.cc',
+        'public/cpp/bindings/tests/binding_callback_unittest.cc',
+        'public/cpp/bindings/tests/binding_unittest.cc',
+        'public/cpp/bindings/tests/bounds_checker_unittest.cc',
+        'public/cpp/bindings/tests/buffer_unittest.cc',
+        'public/cpp/bindings/tests/callback_unittest.cc',
+        'public/cpp/bindings/tests/connector_unittest.cc',
+        'public/cpp/bindings/tests/constant_unittest.cc',
+        'public/cpp/bindings/tests/container_test_util.cc',
+        'public/cpp/bindings/tests/equals_unittest.cc',
+        'public/cpp/bindings/tests/handle_passing_unittest.cc',
+        'public/cpp/bindings/tests/interface_ptr_unittest.cc',
+        'public/cpp/bindings/tests/map_unittest.cc',
+        'public/cpp/bindings/tests/message_queue.cc',
+        'public/cpp/bindings/tests/message_queue.h',
+        'public/cpp/bindings/tests/multiplex_router_unittest.cc',
+        'public/cpp/bindings/tests/pickle_unittest.cc',
+        'public/cpp/bindings/tests/pickled_struct_blink.cc',
+        'public/cpp/bindings/tests/pickled_struct_blink.h',
+        'public/cpp/bindings/tests/pickled_struct_chromium.cc',
+        'public/cpp/bindings/tests/pickled_struct_chromium.h',
+        'public/cpp/bindings/tests/rect_blink.h',
+        'public/cpp/bindings/tests/rect_chromium.h',
+        'public/cpp/bindings/tests/request_response_unittest.cc',
+        'public/cpp/bindings/tests/router_test_util.cc',
+        'public/cpp/bindings/tests/router_test_util.h',
+        'public/cpp/bindings/tests/router_unittest.cc',
+        'public/cpp/bindings/tests/sample_service_unittest.cc',
+        'public/cpp/bindings/tests/serialization_warning_unittest.cc',
+        'public/cpp/bindings/tests/string_unittest.cc',
+        'public/cpp/bindings/tests/struct_traits_unittest.cc',
+        'public/cpp/bindings/tests/struct_unittest.cc',
+        'public/cpp/bindings/tests/type_conversion_unittest.cc',
+        'public/cpp/bindings/tests/union_unittest.cc',
+        'public/cpp/bindings/tests/validation_unittest.cc',
+      ],
+    },
+    {
+      # GN version: //mojo/edk/test:mojo_public_bindings_perftests
+      'target_name': 'mojo_public_bindings_perftests',
+      'type': 'executable',
+      'dependencies': [
+        '../testing/gtest.gyp:gtest',
+        'mojo_base.gyp:mojo_common_lib',
+        'mojo_edk.gyp:mojo_run_all_unittests',
+        'mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_environment_standalone',
+        'mojo_public.gyp:mojo_public_bindings_test_utils',
+        'mojo_public.gyp:mojo_public_test_interfaces',
+        'mojo_public.gyp:mojo_public_test_utils',
+        'mojo_public.gyp:mojo_utility',
+      ],
+      'sources': [
+        'public/cpp/bindings/tests/bindings_perftest.cc',
+      ],
+    },
+    {
+      # GN version: //mojo/edk/test:mojo_public_environment_unittests
+      'target_name': 'mojo_public_environment_unittests',
+      'type': 'executable',
+      'dependencies': [
+        '../testing/gtest.gyp:gtest',
+        'mojo_edk.gyp:mojo_run_all_unittests',
+        'mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_environment_standalone',
+        'mojo_public.gyp:mojo_public_test_utils',
+        'mojo_public.gyp:mojo_utility',
+      ],
+      'sources': [
+        'public/cpp/environment/tests/async_wait_unittest.cc',
+        'public/cpp/environment/tests/async_waiter_unittest.cc',
+        'public/cpp/environment/tests/logger_unittest.cc',
+        'public/cpp/environment/tests/logging_unittest.cc',
+      ],
+    },
+    {
+      # GN version: //mojo/public/cpp/system/tests:mojo_public_system_unittests
+      # and         //mojo/public/c/system/tests
+      'target_name': 'mojo_public_system_unittests',
+      'type': 'executable',
+      'dependencies': [
+        '../testing/gtest.gyp:gtest',
+        'mojo_edk.gyp:mojo_run_all_unittests',
+        'mojo_public.gyp:mojo_public_test_utils',
+      ],
+      'sources': [
+        '<@(mojo_public_system_unittest_sources)',
+      ],
+    },
+    {
+      # GN version: //mojo/public/cpp/application/tests:mojo_public_utility_unittests
+      'target_name': 'mojo_public_utility_unittests',
+      'type': 'executable',
+      'dependencies': [
+        '../testing/gtest.gyp:gtest',
+        'mojo_edk.gyp:mojo_run_all_unittests',
+        'mojo_public.gyp:mojo_cpp_bindings',
+        'mojo_public.gyp:mojo_public_test_utils',
+        'mojo_public.gyp:mojo_utility',
+      ],
+      'sources': [
+        'public/cpp/utility/tests/mutex_unittest.cc',
+        'public/cpp/utility/tests/run_loop_unittest.cc',
+        'public/cpp/utility/tests/thread_unittest.cc',
+      ],
+      'conditions': [
+        # See crbug.com/342893:
+        ['OS=="win"', {
+          'sources!': [
+            'public/cpp/utility/tests/mutex_unittest.cc',
+            'public/cpp/utility/tests/thread_unittest.cc',
+          ],
+        }],
+      ],
+    },
+    {
+      # GN version: //mojo/edk/test:mojo_public_system_perftests
+      'target_name': 'mojo_public_system_perftests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../testing/gtest.gyp:gtest',
-        'mojo_edk.gyp:mojo_common_test_support2',
-        'mojo_edk.gyp:mojo_system_impl2',
+        'mojo_edk.gyp:mojo_run_all_perftests',
+        'mojo_public.gyp:mojo_public_test_utils',
+        'mojo_public.gyp:mojo_utility',
+      ],
+      'sources': [
+        'public/c/system/tests/core_perftest.cc',
+      ],
+    },
+    {
+      # GN version: //mojo/edk/system:mojo_system_unittests
+      'target_name': 'mojo_system_unittests',
+      'type': 'executable',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../testing/gtest.gyp:gtest',
+        'mojo_edk.gyp:mojo_common_test_support',
+        'mojo_edk.gyp:mojo_run_all_unittests',
+        'mojo_edk.gyp:mojo_system_impl',
       ],
       'sources': [
         'edk/embedder/embedder_unittest.cc',
         'edk/embedder/platform_channel_pair_posix_unittest.cc',
         'edk/embedder/simple_platform_shared_buffer_unittest.cc',
         'edk/system/awakable_list_unittest.cc',
         'edk/system/core_test_base.cc',
         'edk/system/core_test_base.h',
         'edk/system/core_unittest.cc',
-        'edk/system/data_pipe_unittest.cc',
-        'edk/system/message_pipe_test_utils.cc',
-        'edk/system/message_pipe_test_utils.h',
         'edk/system/message_pipe_unittest.cc',
         'edk/system/multiprocess_message_pipe_unittest.cc',
         'edk/system/options_validation_unittest.cc',
         'edk/system/platform_handle_dispatcher_unittest.cc',
-        'edk/system/run_all_unittests.cc',
         'edk/system/shared_buffer_dispatcher_unittest.cc',
         'edk/system/shared_buffer_unittest.cc',
         'edk/system/test_utils.cc',
         'edk/system/test_utils.h',
         'edk/system/wait_set_dispatcher_unittest.cc',
         'edk/system/waiter_test_utils.cc',
         'edk/system/waiter_test_utils.h',
         'edk/system/waiter_unittest.cc',
-        'edk/test/multiprocess_test_helper_unittest.cc',
       ],
       'conditions': [
         ['OS=="ios"', {
           'sources!': [
-            'edk/embedder/embedder_unittest.cc',
             'edk/system/multiprocess_message_pipe_unittest.cc',
-            'edk/system/shared_buffer_unittest.cc',
           ],
         }],
       ],
     },
     {
       # GN version: //mojo/edk/system:mojo_message_pipe_perftests
-      'target_name': 'mojo_message_pipe_perftests2',
+      'target_name': 'mojo_message_pipe_perftests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
-        '../base/base.gyp:test_support_perf',
         '../testing/gtest.gyp:gtest',
-        'mojo_edk.gyp:mojo_common_test_support2',
-        'mojo_edk.gyp:mojo_system_impl2',
+        'mojo_edk.gyp:mojo_common_test_support',
+        'mojo_edk.gyp:mojo_run_all_perftests',
+        'mojo_edk.gyp:mojo_system_impl',
       ],
       'sources': [
         'edk/system/message_pipe_perftest.cc',
-        'edk/system/message_pipe_test_utils.cc',
-        'edk/system/message_pipe_test_utils.h',
         'edk/system/test_utils.cc',
         'edk/system/test_utils.h',
       ],
     },
     # TODO(yzshen): fix the following two targets.
     {
       # GN version: //mojo/edk/js/test:js_unittests
       'target_name': 'mojo_js_unittests',
       'type': 'executable',
       'dependencies': [
         '../gin/gin.gyp:gin_test',
-        '../third_party/mojo/mojo_public.gyp:mojo_environment_standalone',
-        '../third_party/mojo/mojo_public.gyp:mojo_public_test_interfaces',
-        '../third_party/mojo/mojo_public.gyp:mojo_utility',
-        'mojo_edk.gyp:mojo_common_test_support2',
-        'mojo_edk.gyp:mojo_run_all_unittests2',
-        'mojo_edk.gyp:mojo_js_lib2',
+        'mojo_edk.gyp:mojo_common_test_support',
+        'mojo_edk.gyp:mojo_run_all_unittests',
+        'mojo_edk.gyp:mojo_js_lib',
+        'mojo_public.gyp:mojo_environment_standalone',
+        'mojo_public.gyp:mojo_public_test_interfaces',
+        'mojo_public.gyp:mojo_utility',
       ],
       'sources': [
         'edk/js/handle_unittest.cc',
         'edk/js/test/run_js_tests.cc',
       ],
     },
     {
       # GN version: //mojo/edk/js/test:js_integration_tests
       'target_name': 'mojo_js_integration_tests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../gin/gin.gyp:gin_test',
-        '../third_party/mojo/mojo_public.gyp:mojo_environment_standalone',
-        '../third_party/mojo/mojo_public.gyp:mojo_public_test_interfaces',
-        '../third_party/mojo/mojo_public.gyp:mojo_utility',
-        'mojo_edk.gyp:mojo_js_lib2',
-        'mojo_edk.gyp:mojo_run_all_unittests2',
+        'mojo_base.gyp:mojo_common_lib',
+        'mojo_edk.gyp:mojo_js_lib',
+        'mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_js_to_cpp_bindings',
+        'mojo_public.gyp:mojo_environment_standalone',
+        'mojo_public.gyp:mojo_public_test_interfaces',
+        'mojo_public.gyp:mojo_utility',
       ],
       'sources': [
         'edk/js/test/run_js_integration_tests.cc',
         'edk/js/tests/js_to_cpp_tests.cc',
       ],
     },
+    {
+      'target_name': 'mojo_js_to_cpp_bindings',
+      'type': 'none',
+      'variables': {
+        'mojom_files': [
+          'edk/js/tests/js_to_cpp.mojom',
+        ],
+      },
+      'includes': [ 'mojom_bindings_generator_explicit.gypi' ],
+    },
+  ],
+  'conditions': [
+    ['test_isolation_mode != "noop"', {
+      'targets': [
+        {
+          'target_name': 'mojo_public_bindings_unittests_run',
+          'type': 'none',
+          'dependencies': [
+            'mojo_public_bindings_unittests',
+          ],
+          'includes': [
+            '../build/isolate.gypi',
+          ],
+          'sources': [
+            'mojo_public_bindings_unittests.isolate',
+          ],
+        },
+        {
+          'target_name': 'mojo_public_environment_unittests_run',
+          'type': 'none',
+          'dependencies': [
+            'mojo_public_environment_unittests',
+          ],
+          'includes': [
+            '../build/isolate.gypi',
+          ],
+          'sources': [
+            'mojo_public_environment_unittests.isolate',
+          ],
+        },
+        {
+          'target_name': 'mojo_public_system_unittests_run',
+          'type': 'none',
+          'dependencies': [
+            'mojo_public_system_unittests',
+          ],
+          'includes': [
+            '../build/isolate.gypi',
+          ],
+          'sources': [
+            'mojo_public_system_unittests.isolate',
+          ],
+        },
+        {
+          'target_name': 'mojo_public_utility_unittests_run',
+          'type': 'none',
+          'dependencies': [
+            'mojo_public_utility_unittests',
+          ],
+          'includes': [
+            '../build/isolate.gypi',
+          ],
+          'sources': [
+            'mojo_public_utility_unittests.isolate',
+          ],
+        },
+      ],
+    }],
   ],
 }