Fold //ipc/mojo into //ipc.

ipc/mojo/ipc_mojo.gyp

Index: ipc/mojo/ipc_mojo.gyp
diff --git a/ipc/mojo/ipc_mojo.gyp b/ipc/mojo/ipc_mojo.gyp
index 90c597ec32c4befa503e7433052a884bdd563369..a6eed3818dbaa3a731b441b44916bbb3903f35fa 100644
--- a/ipc/mojo/ipc_mojo.gyp
+++ b/ipc/mojo/ipc_mojo.gyp
@@ -10,45 +10,6 @@
   ],
   'targets': [
     {
-      'target_name': 'ipc_mojo',
-      'type': '<(component)',
-      'variables': {
-      },
-      'defines': [
-        'IPC_MOJO_IMPLEMENTATION',
-      ],
-      'includes': [ '../../mojo/mojom_bindings_generator.gypi' ],
-      'dependencies': [
-        '../ipc.gyp:ipc',
-        '../../base/base.gyp:base',
-        '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../../mojo/mojo_edk.gyp:mojo_system_impl',
-        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
-      ],
-      'sources': [
-        'ipc_channel_mojo.cc',
-        'ipc_channel_mojo.h',
-        'ipc_mojo_bootstrap.cc',
-        'ipc_mojo_bootstrap.h',
-        'ipc_mojo_handle_attachment.cc',
-        'ipc_mojo_handle_attachment.h',
-        'ipc_mojo_message_helper.cc',
-        'ipc_mojo_message_helper.h',
-        'ipc_mojo_param_traits.cc',
-        'ipc_mojo_param_traits.h',
-        'ipc_message_pipe_reader.cc',
-        'ipc_message_pipe_reader.h',
-        'ipc.mojom',
-      ],
-      # TODO(gregoryd): direct_dependent_settings should be shared with the
-      # 64-bit target, but it doesn't work due to a bug in gyp
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '..',
-        ],
-      },
-    },
-    {
       'target_name': 'ipc_mojo_support',
       'type': 'static_library',
       'dependencies': [
@@ -60,76 +21,5 @@
         'scoped_ipc_support.h',
       ],
     },
-    {
-      'target_name': 'ipc_mojo_unittests',
-      'type': '<(gtest_target_type)',
-      'dependencies': [
-        '../ipc.gyp:ipc',
-        '../ipc.gyp:test_support_ipc',
-        '../../base/base.gyp:base',
-        '../../base/base.gyp:base_i18n',
-        '../../base/base.gyp:test_support_base',
-        '../../mojo/mojo_edk.gyp:mojo_common_test_support',
-        '../../mojo/mojo_edk.gyp:mojo_system_impl',
-        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
-        '../../testing/gtest.gyp:gtest',
-        'ipc_mojo',
-      ],
-      'include_dirs': [
-        '..'
-      ],
-      'sources': [
-        'run_all_unittests.cc',
-
-        "ipc_channel_mojo_unittest.cc",
-        'ipc_mojo_bootstrap_unittest.cc',
-      ],
-      'conditions': [
-      ],
-    },
-    {
-      'target_name': 'ipc_mojo_perftests',
-      'type': '<(gtest_target_type)',
-      'dependencies': [
-        '../ipc.gyp:ipc',
-        '../ipc.gyp:test_support_ipc',
-        '../../base/base.gyp:base',
-        '../../base/base.gyp:base_i18n',
-        '../../base/base.gyp:test_support_base',
-        '../../base/base.gyp:test_support_perf',
-        '../../mojo/mojo_edk.gyp:mojo_common_test_support',
-        '../../mojo/mojo_edk.gyp:mojo_system_impl',
-        '../../mojo/mojo_public.gyp:mojo_cpp_bindings',
-        '../../testing/gtest.gyp:gtest',
-        'ipc_mojo',
-      ],
-      'include_dirs': [
-        '..'
-      ],
-      'sources': [
-        'ipc_mojo_perftest.cc',
-      ],
-      'conditions': [
-      ],
-    },
-  ],
-  'conditions': [
-    ['test_isolation_mode != "noop"', {
-      'targets': [
-        {
-          'target_name': 'ipc_mojo_unittests_run',
-          'type': 'none',
-          'dependencies': [
-            'ipc_mojo_unittests',
-          ],
-          'includes': [
-            '../../build/isolate.gypi',
-          ],
-          'sources': [
-            'ipc_mojo_unittests.isolate',
-          ],
-        },
-      ],
-    }],
   ],
 }