Mojo C++ bindings: remove the utility/ folder.

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': [
     '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_perftests',
         'mojo_public_bindings_perftests',
         'mojo_public_bindings_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': [
@@ skipping 14 matching lines @@
         'mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_public.gyp:mojo_cpp_bindings',
         'mojo_public.gyp:mojo_message_pump_lib',
         '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_interfaces_struct_traits',
         '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',
@@ skipping 38 matching lines @@
       'dependencies': [
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
         'mojo_base.gyp:mojo_common_lib',
         'mojo_edk.gyp:mojo_run_all_perftests',
         'mojo_public.gyp:mojo_cpp_bindings',
         'mojo_public.gyp:mojo_message_pump_lib',
         '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',
         'public/cpp/bindings/tests/e2e_perftest.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_cpp_system',
         '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_run_all_perftests',
         'mojo_public.gyp:mojo_public_test_utils',
       ],
       'sources': [
@@ skipping 63 matching lines @@
     {
       # GN version: //mojo/edk/js/test:js_unittests
       'target_name': 'mojo_js_unittests',
       'type': 'executable',
       'dependencies': [
         '../gin/gin.gyp:gin_test',
         'mojo_edk.gyp:mojo_common_test_support',
         'mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_edk.gyp:mojo_js_lib',
         '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',
         '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_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': {
@@ skipping 26 matching lines @@
           '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',
-          ],
-        },
       ],
     }],
   ],
 }