15 files changed, 16 insertions, 21 deletions
diff --git a/chrome/renderer/automation/dom_automation_controller.h b/chrome/renderer/automation/dom_automation_controller.h
index e886165..33e6111 100644
--- a/chrome/renderer/automation/dom_automation_controller.h
+++ b/chrome/renderer/automation/dom_automation_controller.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_RENDERER_AUTOMATION_DOM_AUTOMATION_CONTROLLER_H__
 #define CHROME_RENDERER_AUTOMATION_DOM_AUTOMATION_CONTROLLER_H__
 
-#include "ipc/ipc_message.h"
+#include "chrome/common/ipc_message.h"
 #include "webkit/glue/cpp_bound_class.h"
 
 /* DomAutomationController class:
diff --git a/chrome/renderer/debug_message_handler.h b/chrome/renderer/debug_message_handler.h
index cc35227..76abd60 100644
--- a/chrome/renderer/debug_message_handler.h
+++ b/chrome/renderer/debug_message_handler.h
@@ -9,7 +9,7 @@
 #ifndef CHROME_RENDERER_DEBUG_MESSAGE_HANDLER_H_
 #define CHROME_RENDERER_DEBUG_MESSAGE_HANDLER_H_
 
-#include "ipc/ipc_channel_proxy.h"
+#include "chrome/common/ipc_channel_proxy.h"
 #include "webkit/glue/debugger_bridge.h"
 
 class RenderView;
diff --git a/chrome/renderer/devtools_agent.h b/chrome/renderer/devtools_agent.h
index e1938c2..9059542 100644
--- a/chrome/renderer/devtools_agent.h
+++ b/chrome/renderer/devtools_agent.h
@@ -10,8 +10,8 @@
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#include "chrome/common/ipc_channel_proxy.h"
 #include "chrome/renderer/devtools_messages.h"
-#include "ipc/ipc_channel_proxy.h"
 #include "webkit/glue/webdevtoolsagent_delegate.h"
 
 class MessageLoop;
diff --git a/chrome/renderer/devtools_messages.h b/chrome/renderer/devtools_messages.h
index 26afac6..709d51f 100644
--- a/chrome/renderer/devtools_messages.h
+++ b/chrome/renderer/devtools_messages.h
@@ -5,12 +5,7 @@
 #ifndef CHROME_RENDERER_DEVTOOLS_MESSAGES_H_
 #define CHROME_RENDERER_DEVTOOLS_MESSAGES_H_
 
-#if 0
-// This for tools which parse #include lines, but cannot process when we
-// include via a macro name.
-#include "chrome/renderer/devtools_messages_internal.h"
-#endif
 #define MESSAGES_INTERNAL_FILE "chrome/renderer/devtools_messages_internal.h"
-#include "ipc/ipc_message_macros.h"
+#include "chrome/common/ipc_message_macros.h"
 
 #endif  // CHROME_RENDERER_DEVTOOLS_MESSAGES_H_
diff --git a/chrome/renderer/devtools_messages_internal.h b/chrome/renderer/devtools_messages_internal.h
index e3fa28e..b0e0a8a 100644
--- a/chrome/renderer/devtools_messages_internal.h
+++ b/chrome/renderer/devtools_messages_internal.h
@@ -42,7 +42,7 @@
 //
 // This file describes developer tools message types.
 
-#include "ipc/ipc_message_macros.h"
+#include "chrome/common/ipc_message_macros.h"
 
 // These are messages sent from DevToolsAgent to DevToolsClient through the
 // browser.
diff --git a/chrome/renderer/dom_ui_bindings.h b/chrome/renderer/dom_ui_bindings.h
index b4ad992..23b2d35 100644
--- a/chrome/renderer/dom_ui_bindings.h
+++ b/chrome/renderer/dom_ui_bindings.h
@@ -5,7 +5,7 @@
 #ifndef CHROME_RENDERER_DOM_UI_BINDINGS_H__
 #define CHROME_RENDERER_DOM_UI_BINDINGS_H__
 
-#include "ipc/ipc_message.h"
+#include "chrome/common/ipc_message.h"
 #include "webkit/glue/cpp_bound_class.h"
 
 // A DOMBoundBrowserObject is a backing for some object bound to the window
diff --git a/chrome/renderer/external_host_bindings.h b/chrome/renderer/external_host_bindings.h
index d995975..cd8bcdb 100644
--- a/chrome/renderer/external_host_bindings.h
+++ b/chrome/renderer/external_host_bindings.h
@@ -5,8 +5,8 @@
 #ifndef CHROME_RENDERER_EXTERNAL_HOST_BINDINGS_H_
 #define CHROME_RENDERER_EXTERNAL_HOST_BINDINGS_H_
 
+#include "chrome/common/ipc_message.h"
 #include "chrome/renderer/dom_ui_bindings.h"
-#include "ipc/ipc_message.h"
 
 // ExternalHostBindings is the class backing the "externalHost" object
 // accessible from Javascript
diff --git a/chrome/renderer/mock_render_thread.cc b/chrome/renderer/mock_render_thread.cc
index 0a7618e..19fdd48 100644
--- a/chrome/renderer/mock_render_thread.cc
+++ b/chrome/renderer/mock_render_thread.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/renderer/mock_render_thread.h"
 
+#include "chrome/common/ipc_message_utils.h"
 #include "chrome/common/render_messages.h"
-#include "ipc/ipc_message_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 MockRenderThread::MockRenderThread()
diff --git a/chrome/renderer/mock_render_thread.h b/chrome/renderer/mock_render_thread.h
index 65543eb..a89822a6 100644
--- a/chrome/renderer/mock_render_thread.h
+++ b/chrome/renderer/mock_render_thread.h
@@ -7,7 +7,7 @@
 
 #include <vector>
 
-#include "ipc/ipc_test_sink.h"
+#include "chrome/common/ipc_test_sink.h"
 #include "chrome/renderer/render_thread.h"
 
 // This class is very simple mock of RenderThread. It simulates an IPC channel
diff --git a/chrome/renderer/render_process.cc b/chrome/renderer/render_process.cc
index dca03c7..e8af233 100644
--- a/chrome/renderer/render_process.cc
+++ b/chrome/renderer/render_process.cc
@@ -23,11 +23,11 @@
 #include "chrome/browser/net/dns_global.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/ipc_channel.h"
+#include "chrome/common/ipc_message_utils.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/transport_dib.h"
 #include "chrome/renderer/render_view.h"
-#include "ipc/ipc_channel.h"
-#include "ipc/ipc_message_utils.h"
 #include "webkit/glue/webkit_glue.h"
 
 // Attempts to load FFmpeg before engaging the sandbox.  Returns true if all
diff --git a/chrome/renderer/render_thread_unittest.cc b/chrome/renderer/render_thread_unittest.cc
index c03f889..808bedf 100644
--- a/chrome/renderer/render_thread_unittest.cc
+++ b/chrome/renderer/render_thread_unittest.cc
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 #include "base/waitable_event.h"
+#include "chrome/common/ipc_sync_channel.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/mock_render_process.h"
 #include "chrome/renderer/render_thread.h"
-#include "ipc/ipc_sync_channel.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h
index 3e58790..7ee2c04 100644
--- a/chrome/renderer/render_widget.h
+++ b/chrome/renderer/render_widget.h
@@ -13,8 +13,8 @@
 #include "base/gfx/size.h"
 #include "base/ref_counted.h"
 #include "base/shared_memory.h"
+#include "chrome/common/ipc_channel.h"
 #include "chrome/renderer/render_process.h"
-#include "ipc/ipc_channel.h"
 #include "skia/ext/platform_canvas.h"
 
 #include "webkit/glue/webwidget_delegate.h"
diff --git a/chrome/renderer/renderer_main_unittest.cc b/chrome/renderer/renderer_main_unittest.cc
index 6bb21bd..c938f5b 100644
--- a/chrome/renderer/renderer_main_unittest.cc
+++ b/chrome/renderer/renderer_main_unittest.cc
@@ -6,8 +6,8 @@
 #include "base/multiprocess_test.h"
 #include "base/process_util.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/ipc_channel.h"
 #include "chrome/common/main_function_params.h"
-#include "ipc/ipc_channel.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // TODO(port): Bring up this test this on other platforms.
diff --git a/chrome/renderer/webplugin_delegate_proxy.h b/chrome/renderer/webplugin_delegate_proxy.h
index 2c20a4f..8af9733 100644
--- a/chrome/renderer/webplugin_delegate_proxy.h
+++ b/chrome/renderer/webplugin_delegate_proxy.h
@@ -10,8 +10,8 @@
 #include "base/gfx/rect.h"
 #include "base/gfx/native_widget_types.h"
 #include "base/ref_counted.h"
+#include "chrome/common/ipc_message.h"
 #include "chrome/renderer/plugin_channel_host.h"
-#include "ipc/ipc_message.h"
 #include "webkit/glue/webplugin.h"
 #include "webkit/glue/webplugin_delegate.h"
 
diff --git a/chrome/renderer/webworker_proxy.h b/chrome/renderer/webworker_proxy.h
index c18d3bd..94c199d 100644
--- a/chrome/renderer/webworker_proxy.h
+++ b/chrome/renderer/webworker_proxy.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "ipc/ipc_channel.h"
+#include "chrome/common/ipc_channel.h"
 #include "webkit/glue/webworker.h"
 
 class GURL;