Fold //ipc/mojo into //ipc.

ipc/ipc.gyp

Index: ipc/ipc.gyp
diff --git a/ipc/ipc.gyp b/ipc/ipc.gyp
index a11ffe3e0bd13fa2757cb47256aa423a2203bb13..fa04574b4c446d4a85132bd32ed9c0280d5ada9d 100644
--- a/ipc/ipc.gyp
+++ b/ipc/ipc.gyp
@@ -17,9 +17,12 @@
         'ipc_target': 1,
       },
       'dependencies': [
+        'ipc_interfaces',
         '../base/base.gyp:base',
         # TODO(viettrungluu): Needed for base/lazy_instance.h, which is suspect.
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../mojo/mojo_edk.gyp:mojo_system_impl',
+        '../mojo/mojo_public.gyp:mojo_cpp_bindings',
       ],
       # TODO(gregoryd): direct_dependent_settings should be shared with the
       # 64-bit target, but it doesn't work due to a bug in gyp
@@ -37,6 +40,16 @@
       ],
     },
     {
+      'target_name': 'ipc_interfaces',
+      'type': 'none',
+      'variables': {
+        'mojom_files': [
+          'ipc.mojom',
+        ],
+      },
+      'includes': [ '../mojo/mojom_bindings_generator_explicit.gypi' ],
+    },
+    {
       'target_name': 'ipc_tests',
       'type': '<(gtest_target_type)',
       'dependencies': [
@@ -46,6 +59,9 @@
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:test_support_base',
         '../crypto/crypto.gyp:crypto',
+        '../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',
       ],
       'include_dirs': [
@@ -55,6 +71,7 @@
         'attachment_broker_mac_unittest.cc',
         'attachment_broker_privileged_mac_unittest.cc',
         'attachment_broker_privileged_win_unittest.cc',
+        'ipc_channel_mojo_unittest.cc',
         'ipc_channel_posix_unittest.cc',
         'ipc_channel_proxy_unittest.cc',
         'ipc_channel_reader_unittest.cc',
@@ -63,6 +80,7 @@
         'ipc_message_attachment_set_posix_unittest.cc',
         'ipc_message_unittest.cc',
         'ipc_message_utils_unittest.cc',
+        'ipc_mojo_bootstrap_unittest.cc',
         'ipc_send_fds_test.cc',
         'ipc_sync_channel_unittest.cc',
         'ipc_sync_message_unittest.cc',
@@ -106,16 +124,20 @@
         '../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',
       ],
       'include_dirs': [
         '..'
       ],
       'sources': [
+        'ipc_mojo_perftest.cc',
         'ipc_perftests.cc',
         'ipc_test_base.cc',
         'ipc_test_base.h',
+        'run_all_perftests.cc',
       ],
       'conditions': [
         ['OS == "android"', {
@@ -161,6 +183,7 @@
             'ipc_target': 1,
           },
           'dependencies': [
+            'ipc_interfaces',
             '../base/base.gyp:base_win64',
             # TODO(viettrungluu): Needed for base/lazy_instance.h, which is
             # suspect.