1 files changed, 5 insertions, 55 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 199a69d3..b7e858f 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -83,6 +83,7 @@
         '../base/base.gyp:base',
         '../base/base.gyp:base_gfx',
         '../build/temp_gyp/googleurl.gyp:googleurl',
+        '../ipc/ipc.gyp:ipc',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../third_party/icu38/icu38.gyp:icui18n',
@@ -163,34 +164,15 @@
         'common/classfactory.h',
         'common/clipboard_service.h',
         'common/common_glue.cc',
+        'common/common_message_utils.cc',
         'common/debug_flags.cc',
         'common/debug_flags.h',
         'common/drag_drop_types.cc',
         'common/drag_drop_types.h',
         'common/env_vars.cc',
         'common/env_vars.h',
-        'common/file_descriptor_set_posix.cc',
-        'common/file_descriptor_set_posix.h',
         'common/filter_policy.h',
         'common/gears_api.h',
-        'common/ipc_channel.h',
-        'common/ipc_channel_posix.cc',
-        'common/ipc_channel_posix.h',
-        'common/ipc_channel_proxy.cc',
-        'common/ipc_channel_proxy.h',
-        'common/ipc_channel_win.cc',
-        'common/ipc_channel_win.h',
-        'common/ipc_logging.cc',
-        'common/ipc_logging.h',
-        'common/ipc_message.cc',
-        'common/ipc_message.h',
-        'common/ipc_message_macros.h',
-        'common/ipc_message_utils.cc',
-        'common/ipc_message_utils.h',
-        'common/ipc_sync_channel.cc',
-        'common/ipc_sync_channel.h',
-        'common/ipc_sync_message.cc',
-        'common/ipc_sync_message.h',
         'common/json_value_serializer.cc',
         'common/json_value_serializer.h',
         'common/jstemplate_builder.cc',
@@ -1739,8 +1721,8 @@
         'browser/renderer_host/test_render_view_host.h',
         'browser/tab_contents/test_web_contents.cc',
         'browser/tab_contents/test_web_contents.h',
-        'common/ipc_test_sink.cc',
-        'common/ipc_test_sink.h',
+        '../ipc/ipc_test_sink.cc',
+        '../ipc/ipc_test_sink.h',
         'renderer/mock_render_process.h',
         'renderer/mock_render_thread.cc',
         'renderer/mock_render_thread.h',
@@ -1838,37 +1820,6 @@
       ],
     },
     {
-      'target_name': 'ipc_tests',
-      'type': 'executable',
-      'dependencies': [
-        'browser',
-        'common',
-        'renderer',
-        'test_support_unit',
-        '../base/base.gyp:base',
-        '../testing/gtest.gyp:gtest',
-      ],
-      'sources': [
-        'common/ipc_fuzzing_tests.cc',
-        'common/ipc_message_unittest.cc',
-        'common/ipc_send_fds_test.cc',
-        'common/ipc_sync_channel_unittest.cc',
-        'common/ipc_sync_channel_unittest.h',
-        'common/ipc_sync_message_unittest.cc',
-        'common/ipc_sync_message_unittest.h',
-        'common/ipc_tests.cc',
-        'common/ipc_tests.h',
-      ],
-      'conditions': [
-        ['OS=="linux"', {
-          'dependencies': [
-            'views',
-            '../build/linux/system.gyp:gtk',
-          ],
-        }],
-      ],
-    },
-    {
       'target_name': 'ui_tests',
       'type': 'executable',
       'dependencies': [
@@ -2158,11 +2109,11 @@
         'common/chrome_plugin_unittest.cc',
         'common/extensions/url_pattern_unittest.cc',
         'common/extensions/user_script_unittest.cc',
-        'common/file_descriptor_set_unittest.cc',
         'common/gfx/chrome_font_unittest.cc',
         'common/gfx/emf_unittest.cc',
         'common/gfx/icon_util_unittest.cc',
         'common/gfx/text_elider_unittest.cc',
+        'common/gurl_serialisation_unittest.cc',
         'common/json_value_serializer_unittest.cc',
         'common/l10n_util_unittest.cc',
         'common/mru_cache_unittest.cc',
@@ -2244,7 +2195,6 @@
             'third_party/wtl/include',
           ],
           'sources!': [
-            'common/file_descriptor_set_unittest.cc',
             'common/net/url_util_unittest.cc',
           ],
           'dependencies': [