Revert "Move IPC code to ipc/"

This reverts commit r13062 which, unsurprisingly, broke the build. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13063 0039d316-1c4b-4281-b951-d872f2087c98
280723148 · Apr 3, 2009 · 82e5ee8 · 82e5ee8
1 parent 8cf3f1d
commit 82e5ee8
Show file tree

Hide file tree

Showing 112 changed files with 828 additions and 730 deletions.
diff --git a/DEPS b/DEPS
@@ -65,7 +65,6 @@ include_rules = [
   # Everybody can use some things.
   "+base",
   "+build",
-  "+ipc",
 
   # For now, we allow ICU to be included by specifying "unicode/...", although
   # this should probably change.
@@ -82,7 +81,6 @@ include_rules = [
 skip_child_includes = [
    "breakpad",
    "gears",
-   "ipc",
    "sdch",
    "skia",
    "testing",

diff --git a/base/base_switches.cc b/base/base_switches.cc
@@ -40,9 +40,4 @@ const wchar_t kEnableDCHECK[]                  = L"enable-dcheck";
 // Available at http://www.adambarth.com/papers/2008/jackson-barth.pdf
 const wchar_t kForceHTTPS[]                    = L"force-https";
 
-// Will add kDebugOnStart to every child processes. If a value is passed, it
-// will be used as a filter to determine if the child process should have the
-// kDebugOnStart flag passed on or not.
-const wchar_t kDebugChildren[]                 = L"debug-children";
-
 }  // namespace switches
diff --git a/base/base_switches.h b/base/base_switches.h
@@ -17,7 +17,6 @@ extern const wchar_t kNoErrorDialogs[];
 extern const wchar_t kProcessType[];
 extern const wchar_t kEnableDCHECK[];
 extern const wchar_t kForceHTTPS[];
-extern const wchar_t kDebugChildren[];
 
 }  // namespace switches
 

diff --git a/base/file_descriptor_posix.h b/base/file_descriptor_posix.h
@@ -12,8 +12,8 @@ namespace base {
 // able to use template specialisation to special-case their handling.
 //
 // WARNING: (Chromium only) There are subtleties to consider if serialising
-// these objects over IPC. See comments in ipc_message_utils.h above the
-// template specialisation for this structure.
+// these objects over IPC. See comments in chrome/common/ipc_message_utils.h
+// above the template specialisation for this structure.
 // -----------------------------------------------------------------------------
 struct FileDescriptor {
   FileDescriptor()

diff --git a/build/all.gyp b/build/all.gyp
@@ -22,7 +22,6 @@
       'type': 'none',
       'dependencies': [
         '../base/base.gyp:*',
-        '../ipc/ipc.gyp:*',
         '../media/media.gyp:*',
         '../net/net.gyp:*',
         '../printing/printing.gyp:*',

diff --git a/chrome/DEPS b/chrome/DEPS
@@ -1,5 +1,4 @@
 include_rules = [
-  "+ipc",
   "+net",
   "+printing",
 

diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h
@@ -21,11 +21,11 @@
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
+#include "chrome/common/ipc_message.h"
+#include "chrome/common/ipc_sync_channel.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/test/automation/automation_messages.h"
 #include "chrome/views/event.h"
-#include "ipc/ipc_message.h"
-#include "ipc/ipc_sync_channel.h"
 
 #if defined(OS_WIN)
 // TODO(port): enable these.

diff --git a/chrome/browser/automation/automation_resource_tracker.h b/chrome/browser/automation/automation_resource_tracker.h
@@ -8,8 +8,8 @@
 #include <map>
 
 #include "base/basictypes.h"
+#include "chrome/common/ipc_message.h"
 #include "chrome/common/notification_service.h"
-#include "ipc/ipc_message.h"
 
 // Template trick so that AutomationResourceTracker can be used with non-pointer
 // types.

diff --git a/chrome/browser/jsmessage_box_handler.h b/chrome/browser/jsmessage_box_handler.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "ipc/ipc_message.h"
+#include "chrome/common/ipc_message.h"
 
 class GURL;
 class WebContents;

diff --git a/chrome/browser/jsmessage_box_handler_win.h b/chrome/browser/jsmessage_box_handler_win.h
@@ -6,11 +6,11 @@
 #define CHROME_BROWSER_JSMESSAGE_BOX_HANDLER_WIN_H_
 
 #include "chrome/browser/jsmessage_box_handler.h"
+#include "chrome/common/ipc_message.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/views/window/app_modal_dialog_delegate.h"
 #include "googleurl/src/gurl.h"
-#include "ipc/ipc_message.h"
 
 class MessageBoxView;
 class WebContents;

diff --git a/chrome/browser/net/resolve_proxy_msg_helper.h b/chrome/browser/net/resolve_proxy_msg_helper.h
@@ -8,7 +8,7 @@
 #include <deque>
 #include <string>
 
-#include "ipc/ipc_message.h"
+#include "chrome/common/ipc_message.h"
 #include "net/base/completion_callback.h"
 #include "googleurl/src/gurl.h"
 #include "net/proxy/proxy_service.h"

diff --git a/chrome/browser/renderer_host/audio_renderer_host.h b/chrome/browser/renderer_host/audio_renderer_host.h
@@ -42,7 +42,7 @@
 #include "base/ref_counted.h"
 #include "base/shared_memory.h"
 #include "base/waitable_event.h"
-#include "ipc/ipc_message.h"
+#include "chrome/common/ipc_message.h"
 #include "media/audio/audio_output.h"
 
 class AudioManager;

diff --git a/chrome/browser/renderer_host/mock_render_process_host.h b/chrome/browser/renderer_host/mock_render_process_host.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
-#include "ipc/ipc_test_sink.h"
+#include "chrome/common/ipc_test_sink.h"
 
 class TransportDIB;
 

diff --git a/chrome/browser/renderer_host/render_process_host.h b/chrome/browser/renderer_host/render_process_host.h
@@ -10,8 +10,8 @@
 #include "base/id_map.h"
 #include "base/process.h"
 #include "base/scoped_ptr.h"
+#include "chrome/common/ipc_sync_channel.h"
 #include "chrome/common/transport_dib.h"
-#include "ipc/ipc_sync_channel.h"
 
 class Profile;
 

diff --git a/chrome/browser/renderer_host/render_widget_host.h b/chrome/browser/renderer_host/render_widget_host.h
@@ -11,8 +11,8 @@
 #include "base/gfx/size.h"
 #include "base/scoped_ptr.h"
 #include "base/timer.h"
+#include "chrome/common/ipc_channel.h"
 #include "chrome/common/native_web_keyboard_event.h"
-#include "ipc/ipc_channel.h"
 #include "testing/gtest/include/gtest/gtest_prod.h"
 #include "webkit/glue/webtextdirection.h"
 

diff --git a/chrome/browser/renderer_host/resource_dispatcher_host.h b/chrome/browser/renderer_host/resource_dispatcher_host.h
@@ -24,7 +24,7 @@
 #include "chrome/browser/renderer_host/resource_handler.h"
 #include "chrome/common/child_process_info.h"
 #include "chrome/common/filter_policy.h"
-#include "ipc/ipc_message.h"
+#include "chrome/common/ipc_message.h"
 #include "net/url_request/url_request.h"
 #include "webkit/glue/resource_type.h"
 

diff --git a/chrome/browser/renderer_host/resource_message_filter.h b/chrome/browser/renderer_host/resource_message_filter.h
@@ -19,10 +19,10 @@
 #include "chrome/browser/net/resolve_proxy_msg_helper.h"
 #include "chrome/browser/renderer_host/render_widget_helper.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
+#include "chrome/common/ipc_channel_proxy.h"
 #include "chrome/common/modal_dialog_event.h"
 #include "chrome/common/notification_observer.h"
 #include "chrome/common/transport_dib.h"
-#include "ipc/ipc_channel_proxy.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCache.h"
 
 #if defined(OS_WIN)

diff --git a/chrome/browser/sandbox_policy.cc b/chrome/browser/sandbox_policy.cc
@@ -19,9 +19,9 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/debug_flags.h"
+#include "chrome/common/ipc_logging.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/win_util.h"
-#include "ipc/ipc_logging.h"
 #include "sandbox/src/sandbox.h"
 #include "webkit/glue/plugins/plugin_list.h"
 

diff --git a/chrome/browser/tab_contents/web_contents_unittest.cc b/chrome/browser/tab_contents/web_contents_unittest.cc
@@ -11,10 +11,10 @@
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/test_web_contents.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/ipc_channel.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/testing_profile.h"
-#include "ipc/ipc_channel.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 static void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params,

diff --git a/chrome/browser/views/about_ipc_dialog.cc b/chrome/browser/views/about_ipc_dialog.cc
@@ -6,7 +6,7 @@
 // IPC_MESSAGE_LOG_ENABLED. We need to use it to define
 // IPC_MESSAGE_MACROS_LOG_ENABLED so render_messages.h will generate the
 // ViewMsgLog et al. functions.
-#include "ipc/ipc_message.h"
+#include "chrome/common/ipc_message.h"
 
 #ifdef IPC_MESSAGE_LOG_ENABLED
 #define IPC_MESSAGE_MACROS_LOG_ENABLED

diff --git a/chrome/browser/views/about_ipc_dialog.h b/chrome/browser/views/about_ipc_dialog.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_VIEWS_ABOUT_IPC_DIALOG_H_
 
 #include "base/singleton.h"
-#include "ipc/ipc_logging.h"
+#include "chrome/common/ipc_logging.h"
 #include "chrome/views/controls/button/button.h"
 #include "chrome/views/controls/table/table_view.h"
 #include "chrome/views/window/dialog_delegate.h"

diff --git a/chrome/browser/worker_host/worker_process_host.h b/chrome/browser/worker_host/worker_process_host.h
@@ -9,8 +9,8 @@
 
 #include "base/basictypes.h"
 #include "chrome/common/child_process_host.h"
+#include "chrome/common/ipc_channel.h"
 #include "googleurl/src/gurl.h"
-#include "ipc/ipc_channel.h"
 
 class ResourceMessageFilter;
 

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
@@ -83,7 +83,6 @@
         '../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',
@@ -164,15 +163,34 @@
         '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',
@@ -1721,8 +1739,8 @@
         'browser/renderer_host/test_render_view_host.h',
         'browser/tab_contents/test_web_contents.cc',
         'browser/tab_contents/test_web_contents.h',
-        '../ipc/ipc_test_sink.cc',
-        '../ipc/ipc_test_sink.h',
+        'common/ipc_test_sink.cc',
+        'common/ipc_test_sink.h',
         'renderer/mock_render_process.h',
         'renderer/mock_render_thread.cc',
         'renderer/mock_render_thread.h',
@@ -1819,6 +1837,37 @@
         }],
       ],
     },
+    {
+      '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',
@@ -2109,11 +2158,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',
@@ -2195,6 +2244,7 @@
             'third_party/wtl/include',
           ],
           'sources!': [
+            'common/file_descriptor_set_unittest.cc',
             'common/net/url_util_unittest.cc',
           ],
           'dependencies': [

diff --git a/chrome/chrome.sln b/chrome/chrome.sln
@@ -20,9 +20,16 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "renderer", "renderer\render
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipc_tests", "common\ipc_tests.vcproj", "{B92AE829-E1CD-4781-824A-DCB1603A1672}"
+	ProjectSection(ProjectDependencies) = postProject
+		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
+		{899F1280-3441-4D1F-BA04-CCD6208D9146} = {899F1280-3441-4D1F-BA04-CCD6208D9146}
+		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
+		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
+	EndProjectSection
+EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common\common.vcproj", "{899F1280-3441-4D1F-BA04-CCD6208D9146}"
 	ProjectSection(ProjectDependencies) = postProject
-		{3476F599-9139-8A7F-8043-1345F4D9571D} = {3476F599-9139-8A7F-8043-1345F4D9571D}
 		{B95AB527-F7DB-41E9-AD91-EB51EE0F56BE} = {B95AB527-F7DB-41E9-AD91-EB51EE0F56BE}
 		{D9DDAF60-663F-49CC-90DC-3D08CC3D1B28} = {D9DDAF60-663F-49CC-90DC-3D08CC3D1B28}
 	EndProjectSection
@@ -593,19 +600,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "media_unittests", "..\media
 		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipc", "..\ipc\ipc.vcproj", "{3476F599-9139-8A7F-8043-1345F4D9571D}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipc_tests", "..\ipc\ipc_tests.vcproj", "{9EFCEB4B-067F-C8F0-790F-6F698DC2E248}"
-	ProjectSection(ProjectDependencies) = postProject
-		{1832A374-8A74-4F9E-B536-69A699B3E165} = {1832A374-8A74-4F9E-B536-69A699B3E165}
-		{3476F599-9139-8A7F-8043-1345F4D9571D} = {3476F599-9139-8A7F-8043-1345F4D9571D}
-		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
-		{BFE8E2A7-3B3B-43B0-A994-3058B852DB8B} = {BFE8E2A7-3B3B-43B0-A994-3058B852DB8B}
-	EndProjectSection
-EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "base", "..\base\base.vcproj", "{1832A374-8A74-4F9E-B536-69A699B3E165}"
 	ProjectSection(ProjectDependencies) = postProject
 		{8C27D792-2648-4F5E-9ED0-374276327308} = {8C27D792-2648-4F5E-9ED0-374276327308}
@@ -3091,8 +3085,6 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{9EFCEB4B-067F-C8F0-790F-6F698DC2E248} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
-		{3476F599-9139-8A7F-8043-1345F4D9571D} = {EF78C1F9-AA17-4CA5-B6CB-39B37A73A3DA}
 		{0026A376-C4F1-4575-A1BA-578C69F07013} = {EB684A4B-98F7-4E68-8EA7-EA74ACF7060B}
 		{018D4F38-6272-448F-A864-976DA09F05D0} = {1174D37F-6ABB-45DA-81B3-C631281273B7}
 		{0557BC3C-DE87-4127-BDAA-9BD9BDB13FB4} = {2325D8C4-8EF5-42AC-8900-492225750DE4}

diff --git a/chrome/common/child_process_host.cc b/chrome/common/child_process_host.cc
@@ -11,13 +11,12 @@
 #include "base/singleton.h"
 #include "base/waitable_event.h"
 #include "chrome/browser/chrome_thread.h"
-#include "chrome/common/common_message_utils.h"
+#include "chrome/common/ipc_logging.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/process_watcher.h"
 #include "chrome/common/result_codes.h"
-#include "ipc/ipc_logging.h"
 
 
 namespace {