Get rid of ipc_sender.h include in ipc_message.h.

Review URL: https://codereview.chromium.org/11574040

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173238 0039d316-1c4b-4281-b951-d872f2087c98

11 files changed, 22 insertions, 10 deletions

diff --git a/chrome/browser/importer/external_process_importer_bridge.cc b/chrome/browser/importer/external_process_importer_bridge.cc
index 9b0481e..ff69443 100644
--- a/chrome/browser/importer/external_process_importer_bridge.cc
+++ b/chrome/browser/importer/external_process_importer_bridge.cc
@@ -13,6 +13,7 @@
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/importer/profile_import_process_messages.h"
 #include "content/public/common/password_form.h"
+#include "ipc/ipc_sender.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/password_manager/ie7_password.h"
diff --git a/chrome/browser/importer/external_process_importer_bridge.h b/chrome/browser/importer/external_process_importer_bridge.h
index 7942ab69..e06ac9d 100644
--- a/chrome/browser/importer/external_process_importer_bridge.h
+++ b/chrome/browser/importer/external_process_importer_bridge.h
@@ -12,7 +12,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/importer/importer_bridge.h"
 #include "chrome/browser/importer/profile_writer.h"
-#include "ipc/ipc_message.h"
 
 class GURL;
 
@@ -21,6 +20,11 @@ class DictionaryValue;
 class TaskRunner;
 }
 
+namespace IPC {
+class Message;
+class Sender;
+}
+
 // When the importer is run in an external process, the bridge is effectively
 // split in half by the IPC infrastructure.  The external bridge receives data
 // and notifications from the importer, and sends it across IPC.  The
diff --git a/content/browser/renderer_host/p2p/socket_host.h b/content/browser/renderer_host/p2p/socket_host.h
index 25a827f..0abb74e 100644
--- a/content/browser/renderer_host/p2p/socket_host.h
+++ b/content/browser/renderer_host/p2p/socket_host.h
@@ -8,9 +8,12 @@
 #include "content/common/content_export.h"
 #include "content/common/p2p_sockets.h"
 
-#include "ipc/ipc_message.h"
 #include "net/base/ip_endpoint.h"
 
+namespace IPC {
+class Sender;
+}
+
 namespace content {
 
 // Base class for P2P sockets.
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp.cc b/content/browser/renderer_host/p2p/socket_host_tcp.cc
index 910574f..2409280 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp.cc
+++ b/content/browser/renderer_host/p2p/socket_host_tcp.cc
@@ -6,6 +6,7 @@
 
 #include "base/sys_byteorder.h"
 #include "content/common/p2p_messages.h"
+#include "ipc/ipc_sender.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
diff --git a/content/browser/renderer_host/p2p/socket_host_udp.cc b/content/browser/renderer_host/p2p/socket_host_udp.cc
index f0a3b6d..0022629 100644
--- a/content/browser/renderer_host/p2p/socket_host_udp.cc
+++ b/content/browser/renderer_host/p2p/socket_host_udp.cc
@@ -6,6 +6,7 @@
 
 #include "base/bind.h"
 #include "content/common/p2p_messages.h"
+#include "ipc/ipc_sender.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
diff --git a/content/browser/renderer_host/p2p/socket_host_udp.h b/content/browser/renderer_host/p2p/socket_host_udp.h
index 048c0c7..710f743 100644
--- a/content/browser/renderer_host/p2p/socket_host_udp.h
+++ b/content/browser/renderer_host/p2p/socket_host_udp.h
@@ -16,7 +16,6 @@
 #include "content/browser/renderer_host/p2p/socket_host.h"
 #include "content/common/content_export.h"
 #include "content/common/p2p_sockets.h"
-#include "ipc/ipc_sender.h"
 #include "net/base/ip_endpoint.h"
 #include "net/udp/udp_server_socket.h"
 
diff --git a/content/public/browser/resource_dispatcher_host_delegate.h b/content/public/browser/resource_dispatcher_host_delegate.h
index 4205b2a..bee58fb 100644
--- a/content/public/browser/resource_dispatcher_host_delegate.h
+++ b/content/public/browser/resource_dispatcher_host_delegate.h
@@ -9,7 +9,6 @@
 
 #include "base/basictypes.h"
 #include "content/common/content_export.h"
-#include "ipc/ipc_message.h"
 #include "webkit/glue/resource_type.h"
 
 class GURL;
@@ -26,6 +25,10 @@ struct Referrer;
 struct ResourceResponse;
 }
 
+namespace IPC {
+class Sender;
+}
+
 namespace net {
 class AuthChallengeInfo;
 class SSLCertRequestInfo;
diff --git a/content/public/test/render_view_fake_resources_test.h b/content/public/test/render_view_fake_resources_test.h
index e6c6e65..cde8596 100644
--- a/content/public/test/render_view_fake_resources_test.h
+++ b/content/public/test/render_view_fake_resources_test.h
@@ -54,6 +54,10 @@
 
 struct ResourceHostMsg_Request;
 
+namespace IPC {
+class Channel;
+}
+
 namespace WebKit {
 class WebFrame;
 class WebHistoryItem;
diff --git a/ipc/ipc_logging.cc b/ipc/ipc_logging.cc
index 9dde5a5..21f14c1 100644
--- a/ipc/ipc_logging.cc
+++ b/ipc/ipc_logging.cc
@@ -22,6 +22,7 @@
 #include "ipc/ipc_switches.h"
 #include "ipc/ipc_sync_message.h"
 #include "ipc/ipc_message_utils.h"
+#include "ipc/ipc_sender.h"
 
 #if defined(OS_POSIX)
 #include <unistd.h>
diff --git a/ipc/ipc_logging.h b/ipc/ipc_logging.h
index 720f5e3..482c06d 100644
--- a/ipc/ipc_logging.h
+++ b/ipc/ipc_logging.h
@@ -28,6 +28,7 @@ typedef base::hash_map<uint32, LogFunction > LogFunctionMap;
 namespace IPC {
 
 class Message;
+class Sender;
 
 // One instance per process.  Needs to be created on the main thread (the UI
 // thread in the browser) but OnPreDispatchMessage/OnPostDispatchMessage
diff --git a/ipc/ipc_message.h b/ipc/ipc_message.h
index e79216d..4209016 100644
--- a/ipc/ipc_message.h
+++ b/ipc/ipc_message.h
@@ -12,10 +12,6 @@
 #include "base/pickle.h"
 #include "ipc/ipc_export.h"
 
-// TODO(brettw) remove this and update files that depend on this being included
-// from here.
-#include "ipc/ipc_sender.h"
-
 #if !defined(NDEBUG)
 #define IPC_MESSAGE_LOG_ENABLED
 #endif
@@ -34,8 +30,6 @@ namespace IPC {
 
 //------------------------------------------------------------------------------
 
-class Channel;
-class Message;
 struct LogData;
 
 class IPC_EXPORT Message : public Pickle {