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

6 files changed, 95 insertions, 82 deletions

diff --git a/chrome/test/automation/autocomplete_edit_proxy.h b/chrome/test/automation/autocomplete_edit_proxy.h
index b14cb6a..79d8975 100644
--- a/chrome/test/automation/autocomplete_edit_proxy.h
+++ b/chrome/test/automation/autocomplete_edit_proxy.h
@@ -9,10 +9,9 @@
 #include <vector>
 
 #include "chrome/browser/autocomplete/autocomplete.h"
-#include "chrome/common/common_message_utils.h"
+#include "chrome/common/ipc_message.h"
+#include "chrome/common/ipc_message_utils.h"
 #include "chrome/test/automation/automation_handle_tracker.h"
-#include "ipc/ipc_message.h"
-#include "ipc/ipc_message_utils.h"
 #include "googleurl/src/gurl.h"
 
 // The purpose of this class is to act as a serializable version of
diff --git a/chrome/test/automation/automation_messages.h b/chrome/test/automation/automation_messages.h
index 9b24acc..5968f78 100644
--- a/chrome/test/automation/automation_messages.h
+++ b/chrome/test/automation/automation_messages.h
@@ -10,9 +10,8 @@
 #include "base/basictypes.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/browser/tab_contents/security_style.h"
-#include "chrome/common/common_message_utils.h"
+#include "chrome/common/ipc_message_utils.h"
 #include "chrome/test/automation/automation_constants.h"
-#include "ipc/ipc_message_utils.h"
 
 struct AutomationMsg_Find_Params {
   // Unused value, which exists only for backwards compat.
@@ -216,13 +215,8 @@ struct ParamTraits<Reposition_Params> {
 
 }  // namespace IPC
 
-#if 0
-// This for tools which parse #include lines, but cannot process when we
-// include via a macro name.
-#include "chrome/test/automation/automation_messages_internal.h"
-#endif
 #define MESSAGES_INTERNAL_FILE \
     "chrome/test/automation/automation_messages_internal.h"
-#include "ipc/ipc_message_macros.h"
+#include "chrome/common/ipc_message_macros.h"
 
 #endif  // CHROME_TEST_AUTOMATION_AUTOMATION_MESSAGES_H__
diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h
index cc7d644..59599b1 100644
--- a/chrome/test/automation/automation_messages_internal.h
+++ b/chrome/test/automation/automation_messages_internal.h
@@ -14,9 +14,9 @@
 #include "base/basictypes.h"
 #include "base/gfx/rect.h"
 #include "base/string16.h"
+#include "chrome/common/ipc_message_macros.h"
 #include "chrome/common/navigation_types.h"
 #include "chrome/test/automation/autocomplete_edit_proxy.h"
-#include "ipc/ipc_message_macros.h"
 #include "googleurl/src/gurl.h"
 
 // NOTE: All IPC messages have either a routing_id of 0 (for asynchronous
diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h
index f31205d..138edd0 100644
--- a/chrome/test/automation/automation_proxy.h
+++ b/chrome/test/automation/automation_proxy.h
@@ -13,11 +13,11 @@
 #include "base/time.h"
 #include "base/thread.h"
 #include "base/waitable_event.h"
+#include "chrome/common/ipc_channel_proxy.h"
+#include "chrome/common/ipc_message.h"
+#include "chrome/common/ipc_sync_channel.h"
 #include "chrome/test/automation/automation_handle_tracker.h"
 #include "chrome/test/automation/automation_messages.h"
-#include "ipc/ipc_channel_proxy.h"
-#include "ipc/ipc_message.h"
-#include "ipc/ipc_sync_channel.h"
 
 #if defined(OS_WIN)
 // TODO(port): Enable this or equivalent.
diff --git a/chrome/test/data/purify/ipc_tests.exe_UMR.txt b/chrome/test/data/purify/ipc_tests.exe_UMR.txt
index 16ee86e..6f7d34f 100644
--- a/chrome/test/data/purify/ipc_tests.exe_UMR.txt
+++ b/chrome/test/data/purify/ipc_tests.exe_UMR.txt
@@ -1,34 +1,34 @@
 Uninitialized memory read in strlen
 Error Location
    ...  
-   ipc/ipc_tests.cc  Send
-   ipc/ipc_tests.cc  MyChannelListener::OnMessageReceived(Message::IPC const&)
-   ipc/ipc_channel.cc  IPC::Channel::ProcessIncomingMessages(void)
-   ipc/ipc_channel.cc  IPC::Channel::OnObjectSignaled(void *)
+   chrome/common/ipc_tests.cc  Send
+   chrome/common/ipc_tests.cc  MyChannelListener::OnMessageReceived(Message::IPC const&)
+   chrome/common/ipc_channel.cc  IPC::Channel::ProcessIncomingMessages(void)
+   chrome/common/ipc_channel.cc  IPC::Channel::OnObjectSignaled(void *)
    base/message_loop.cc  MessageLoop::SignalWatcher(DWORD)
    base/message_loop.cc  MessageLoop::ProcessNextObject(void)
    base/message_loop.cc  MessageLoop::Run(Dispatcher::MessageLoop *)
    base/message_loop.cc  MessageLoop::Run(void)
-   ipc/ipc_tests.cc  RunTestClient
-   ipc/ipc_tests.cc  main
+   chrome/common/ipc_tests.cc  RunTestClient
+   chrome/common/ipc_tests.cc  main
    ...  
 
 Uninitialized memory read in WriteFile
 Error Location
    ...  
-   ipc/ipc_channel.cc  IPC::Channel::ProcessOutgoingMessages(void)
-   ipc/ipc_channel.cc  IPC::Channel::OnObjectSignaled(void *)
-   ipc/ipc_channel.cc  IPC::Channel::Send(Message::IPC *)
-   ipc/ipc_tests.cc  Send
-   ipc/ipc_tests.cc  MyChannelListener::OnMessageReceived(Message::IPC const&)
-   ipc/ipc_channel.cc  IPC::Channel::ProcessIncomingMessages(void)
-   ipc/ipc_channel.cc  IPC::Channel::OnObjectSignaled(void *)
+   chrome/common/ipc_channel.cc  IPC::Channel::ProcessOutgoingMessages(void)
+   chrome/common/ipc_channel.cc  IPC::Channel::OnObjectSignaled(void *)
+   chrome/common/ipc_channel.cc  IPC::Channel::Send(Message::IPC *)
+   chrome/common/ipc_tests.cc  Send
+   chrome/common/ipc_tests.cc  MyChannelListener::OnMessageReceived(Message::IPC const&)
+   chrome/common/ipc_channel.cc  IPC::Channel::ProcessIncomingMessages(void)
+   chrome/common/ipc_channel.cc  IPC::Channel::OnObjectSignaled(void *)
    base/message_loop.cc  MessageLoop::SignalWatcher(DWORD)
    base/message_loop.cc  MessageLoop::ProcessNextObject(void)
    base/message_loop.cc  MessageLoop::Run(Dispatcher::MessageLoop *)
    base/message_loop.cc  MessageLoop::Run(void)
-   ipc/ipc_tests.cc  RunTestClient
-   ipc/ipc_tests.cc  main
+   chrome/common/ipc_tests.cc  RunTestClient
+   chrome/common/ipc_tests.cc  main
    ...  
 Alloc Location
    ...  
@@ -36,47 +36,47 @@ Alloc Location
    base/pickle.cc  Pickle::BeginWrite(UINT)
    base/pickle.cc  Pickle::WriteBytes(void const*,int)
    base/pickle.cc  Pickle::WriteString(basic_string::std const&)
-   ipc/ipc_tests.cc  Send
-   ipc/ipc_tests.cc  MyChannelListener::OnMessageReceived(Message::IPC const&)
-   ipc/ipc_channel.cc  IPC::Channel::ProcessIncomingMessages(void)
-   ipc/ipc_channel.cc  IPC::Channel::OnObjectSignaled(void *)
+   chrome/common/ipc_tests.cc  Send
+   chrome/common/ipc_tests.cc  MyChannelListener::OnMessageReceived(Message::IPC const&)
+   chrome/common/ipc_channel.cc  IPC::Channel::ProcessIncomingMessages(void)
+   chrome/common/ipc_channel.cc  IPC::Channel::OnObjectSignaled(void *)
    base/message_loop.cc  MessageLoop::SignalWatcher(DWORD)
    base/message_loop.cc  MessageLoop::ProcessNextObject(void)
    base/message_loop.cc  MessageLoop::Run(Dispatcher::MessageLoop *)
    base/message_loop.cc  MessageLoop::Run(void)
-   ipc/ipc_tests.cc  RunTestClient
-   ipc/ipc_tests.cc  main
+   chrome/common/ipc_tests.cc  RunTestClient
+   chrome/common/ipc_tests.cc  main
    ...  
 
 Uninitialized memory read in strlen
 Error Location
    ...  
-   ipc/ipc_tests.cc  Send
-   ipc/ipc_tests.cc  MyChannelListener::OnMessageReceived(Message::IPC const&)
-   ipc/ipc_channel.cc  IPC::Channel::ProcessIncomingMessages(void)
-   ipc/ipc_channel.cc  IPC::Channel::OnObjectSignaled(void *)
+   chrome/common/ipc_tests.cc  Send
+   chrome/common/ipc_tests.cc  MyChannelListener::OnMessageReceived(Message::IPC const&)
+   chrome/common/ipc_channel.cc  IPC::Channel::ProcessIncomingMessages(void)
+   chrome/common/ipc_channel.cc  IPC::Channel::OnObjectSignaled(void *)
    base/message_loop.cc  MessageLoop::SignalWatcher(DWORD)
    base/message_loop.cc  MessageLoop::Run(Dispatcher::MessageLoop *)
    base/message_loop.cc  MessageLoop::Run(void)
-   ipc/ipc_tests.cc  RunTestClient
-   ipc/ipc_tests.cc  main
+   chrome/common/ipc_tests.cc  RunTestClient
+   chrome/common/ipc_tests.cc  main
    ...  
 
 Uninitialized memory read in WriteFile
 Error Location
    ...  
-   ipc/ipc_channel.cc  IPC::Channel::ProcessOutgoingMessages(void)
-   ipc/ipc_channel.cc  IPC::Channel::OnObjectSignaled(void *)
-   ipc/ipc_channel.cc  IPC::Channel::Send(Message::IPC *)
-   ipc/ipc_tests.cc  Send
-   ipc/ipc_tests.cc  MyChannelListener::OnMessageReceived(Message::IPC const&)
-   ipc/ipc_channel.cc  IPC::Channel::ProcessIncomingMessages(void)
-   ipc/ipc_channel.cc  IPC::Channel::OnObjectSignaled(void *)
+   chrome/common/ipc_channel.cc  IPC::Channel::ProcessOutgoingMessages(void)
+   chrome/common/ipc_channel.cc  IPC::Channel::OnObjectSignaled(void *)
+   chrome/common/ipc_channel.cc  IPC::Channel::Send(Message::IPC *)
+   chrome/common/ipc_tests.cc  Send
+   chrome/common/ipc_tests.cc  MyChannelListener::OnMessageReceived(Message::IPC const&)
+   chrome/common/ipc_channel.cc  IPC::Channel::ProcessIncomingMessages(void)
+   chrome/common/ipc_channel.cc  IPC::Channel::OnObjectSignaled(void *)
    base/message_loop.cc  MessageLoop::SignalWatcher(DWORD)
    base/message_loop.cc  MessageLoop::Run(Dispatcher::MessageLoop *)
    base/message_loop.cc  MessageLoop::Run(void)
-   ipc/ipc_tests.cc  RunTestClient
-   ipc/ipc_tests.cc  main
+   chrome/common/ipc_tests.cc  RunTestClient
+   chrome/common/ipc_tests.cc  main
    ...  
 Alloc Location
    ...  
@@ -84,31 +84,31 @@ Alloc Location
    base/pickle.cc  Pickle::BeginWrite(UINT)
    base/pickle.cc  Pickle::WriteBytes(void const*,int)
    base/pickle.cc  Pickle::WriteString(basic_string::std const&)
-   ipc/ipc_tests.cc  Send
-   ipc/ipc_tests.cc  MyChannelListener::OnMessageReceived(Message::IPC const&)
-   ipc/ipc_channel.cc  IPC::Channel::ProcessIncomingMessages(void)
-   ipc/ipc_channel.cc  IPC::Channel::OnObjectSignaled(void *)
+   chrome/common/ipc_tests.cc  Send
+   chrome/common/ipc_tests.cc  MyChannelListener::OnMessageReceived(Message::IPC const&)
+   chrome/common/ipc_channel.cc  IPC::Channel::ProcessIncomingMessages(void)
+   chrome/common/ipc_channel.cc  IPC::Channel::OnObjectSignaled(void *)
    base/message_loop.cc  MessageLoop::SignalWatcher(DWORD)
    base/message_loop.cc  MessageLoop::Run(Dispatcher::MessageLoop *)
    base/message_loop.cc  MessageLoop::Run(void)
-   ipc/ipc_tests.cc  RunTestClient
-   ipc/ipc_tests.cc  main
+   chrome/common/ipc_tests.cc  RunTestClient
+   chrome/common/ipc_tests.cc  main
    ...  
 
 Uninitialized memory read in WriteFile
 Error Location
    ...  
-   ipc/ipc_channel.cc  IPC::Channel::ProcessOutgoingMessages(void)
-   ipc/ipc_channel.cc  IPC::Channel::Send(Message::IPC *)
-   ipc/ipc_tests.cc  Send
-   ipc/ipc_tests.cc  MyChannelListener::OnMessageReceived(Message::IPC const&)
-   ipc/ipc_channel.cc  IPC::Channel::ProcessIncomingMessages(void)
-   ipc/ipc_channel.cc  IPC::Channel::OnObjectSignaled(void *)
+   chrome/common/ipc_channel.cc  IPC::Channel::ProcessOutgoingMessages(void)
+   chrome/common/ipc_channel.cc  IPC::Channel::Send(Message::IPC *)
+   chrome/common/ipc_tests.cc  Send
+   chrome/common/ipc_tests.cc  MyChannelListener::OnMessageReceived(Message::IPC const&)
+   chrome/common/ipc_channel.cc  IPC::Channel::ProcessIncomingMessages(void)
+   chrome/common/ipc_channel.cc  IPC::Channel::OnObjectSignaled(void *)
    base/message_loop.cc  MessageLoop::SignalWatcher(DWORD)
    base/message_loop.cc  MessageLoop::Run(Dispatcher::MessageLoop *)
    base/message_loop.cc  MessageLoop::Run(void)
-   ipc/ipc_tests.cc  RunTestClient
-   ipc/ipc_tests.cc  main
+   chrome/common/ipc_tests.cc  RunTestClient
+   chrome/common/ipc_tests.cc  main
    ...  
 Alloc Location
    ...  
@@ -116,33 +116,33 @@ Alloc Location
    base/pickle.cc  Pickle::BeginWrite(UINT)
    base/pickle.cc  Pickle::WriteBytes(void const*,int)
    base/pickle.cc  Pickle::WriteString(basic_string::std const&)
-   ipc/ipc_tests.cc  Send
-   ipc/ipc_tests.cc  MyChannelListener::OnMessageReceived(Message::IPC const&)
-   ipc/ipc_channel.cc  IPC::Channel::ProcessIncomingMessages(void)
-   ipc/ipc_channel.cc  IPC::Channel::OnObjectSignaled(void *)
+   chrome/common/ipc_tests.cc  Send
+   chrome/common/ipc_tests.cc  MyChannelListener::OnMessageReceived(Message::IPC const&)
+   chrome/common/ipc_channel.cc  IPC::Channel::ProcessIncomingMessages(void)
+   chrome/common/ipc_channel.cc  IPC::Channel::OnObjectSignaled(void *)
    base/message_loop.cc  MessageLoop::SignalWatcher(DWORD)
    base/message_loop.cc  MessageLoop::Run(Dispatcher::MessageLoop *)
    base/message_loop.cc  MessageLoop::Run(void)
-   ipc/ipc_tests.cc  RunTestClient
-   ipc/ipc_tests.cc  main
+   chrome/common/ipc_tests.cc  RunTestClient
+   chrome/common/ipc_tests.cc  main
    ...  
 
 Uninitialized memory read in strlen
 Error Location
    ...  
-   ipc/ipc_tests.cc  Send
-   ipc/ipc_tests.cc  RunTestClient
-   ipc/ipc_tests.cc  main
+   chrome/common/ipc_tests.cc  Send
+   chrome/common/ipc_tests.cc  RunTestClient
+   chrome/common/ipc_tests.cc  main
    ...  
 
 Uninitialized memory read in WriteFile
 Error Location
    ...  
-   ipc/ipc_channel.cc  IPC::Channel::ProcessOutgoingMessages(void)
-   ipc/ipc_channel.cc  IPC::Channel::Send(Message::IPC *)
-   ipc/ipc_tests.cc  Send
-   ipc/ipc_tests.cc  RunTestClient
-   ipc/ipc_tests.cc  main
+   chrome/common/ipc_channel.cc  IPC::Channel::ProcessOutgoingMessages(void)
+   chrome/common/ipc_channel.cc  IPC::Channel::Send(Message::IPC *)
+   chrome/common/ipc_tests.cc  Send
+   chrome/common/ipc_tests.cc  RunTestClient
+   chrome/common/ipc_tests.cc  main
    ...  
 Alloc Location
    ...  
@@ -150,8 +150,8 @@ Alloc Location
    base/pickle.cc  Pickle::BeginWrite(UINT)
    base/pickle.cc  Pickle::WriteBytes(void const*,int)
    base/pickle.cc  Pickle::WriteString(basic_string::std const&)
-   ipc/ipc_tests.cc  Send
-   ipc/ipc_tests.cc  RunTestClient
-   ipc/ipc_tests.cc  main
+   chrome/common/ipc_tests.cc  Send
+   chrome/common/ipc_tests.cc  RunTestClient
+   chrome/common/ipc_tests.cc  main
    ...  
 
diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj
index 508470d..46f501b 100644
--- a/chrome/test/unit/unittests.vcproj
+++ b/chrome/test/unit/unittests.vcproj
@@ -884,6 +884,26 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\common\ipc_message_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\ipc_sync_channel_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\ipc_sync_channel_unittest.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\ipc_sync_message_unittest.cc"
+				>
+			</File>
+			<File
+				RelativePath="..\..\common\ipc_sync_message_unittest.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\common\json_value_serializer_unittest.cc"
 				>
 			</File>