Index: chrome/chrome.gyp |
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp |
index 8adc0f7a9ace478f0d2e0aadf8717ee99bae2efd..d4f1810659ac8959365081ff1898b146edef85a8 100644 |
--- a/chrome/chrome.gyp |
+++ b/chrome/chrome.gyp |
@@ -300,6 +300,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', |
@@ -361,6 +362,7 @@ |
'common/chrome_constants.h', |
'common/chrome_counters.cc', |
'common/chrome_counters.h', |
+ 'common/chrome_descriptors.h', |
'common/chrome_paths.cc', |
'common/chrome_paths.h', |
'common/chrome_paths_internal.h', |
@@ -377,14 +379,14 @@ |
'common/classfactory.cc', |
'common/classfactory.h', |
'common/common_glue.cc', |
+ 'common/common_param_traits.cc', |
+ 'common/common_param_traits.h', |
'common/debug_flags.cc', |
'common/debug_flags.h', |
'common/devtools_messages.h', |
'common/devtools_messages_internal.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/gtk_util.cc', |
@@ -393,25 +395,6 @@ |
'common/histogram_synchronizer.h', |
'common/important_file_writer.cc', |
'common/important_file_writer.h', |
- 'common/ipc_channel.h', |
- 'common/ipc_channel_handle.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', |
@@ -3479,35 +3462,6 @@ |
], |
}, |
{ |
- 'target_name': 'ipc_tests', |
- 'type': 'executable', |
- 'msvs_guid': 'B92AE829-E1CD-4781-824A-DCB1603A1672', |
- 'dependencies': [ |
- 'common', |
- 'test_support_unit', |
- '../base/base.gyp:base', |
- '../testing/gtest.gyp:gtest', |
- ], |
- 'sources': [ |
- 'common/ipc_fuzzing_tests.cc', |
- 'common/ipc_send_fds_test.cc', |
- 'common/ipc_tests.cc', |
- 'common/ipc_tests.h', |
- ], |
- 'conditions': [ |
- ['OS=="linux"', { |
- 'dependencies': [ |
- '../build/linux/system.gyp:gtk', |
- ], |
- }], |
- ['OS=="linux" and toolkit_views==1', { |
- 'dependencies': [ |
- '../views/views.gyp:views', |
- ], |
- }], |
- ], |
- }, |
- { |
'target_name': 'ui_tests', |
'type': 'executable', |
'msvs_guid': '76235B67-1C27-4627-8A33-4B2E1EF93EDE', |
@@ -3660,6 +3614,7 @@ |
'test_support_unit', |
'utility', |
'../app/app.gyp:app_resources', |
+ '../ipc/ipc.gyp:ipc', |
'../net/net.gyp:net_resources', |
'../net/net.gyp:net_test_support', |
'../printing/printing.gyp:printing', |
@@ -3883,15 +3838,11 @@ |
'common/bzip2_unittest.cc', |
'common/child_process_logging_mac_unittest.mm', |
'common/chrome_plugin_unittest.cc', |
+ 'common/common_param_traits_unittest.cc', |
'common/extensions/extension_unittest.cc', |
'common/extensions/url_pattern_unittest.cc', |
'common/extensions/user_script_unittest.cc', |
- 'common/file_descriptor_set_unittest.cc', |
'common/important_file_writer_unittest.cc', |
- 'common/ipc_message_unittest.cc', |
- 'common/ipc_sync_channel_unittest.cc', |
- 'common/ipc_sync_message_unittest.cc', |
- 'common/ipc_sync_message_unittest.h', |
'common/json_value_serializer_unittest.cc', |
'common/mru_cache_unittest.cc', |
'common/net/url_util_unittest.cc', |
@@ -4029,7 +3980,6 @@ |
], |
'sources!': [ |
'browser/gtk/tabs/tab_renderer_gtk_unittest.cc', |
- 'common/file_descriptor_set_unittest.cc', |
'common/net/url_util_unittest.cc', |
], |
'link_settings': { |