Move a bunch of child-only code from content/common to content/child

Was just trying to move content/common/resource_dispatcher.{cc,h}, but that ends up needing a lot of other things to move.

TBR=jam@chromium.org

BUG=246357

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

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

102 files changed, 210 insertions, 209 deletions

diff --git a/content/app/android/child_process_service.cc b/content/app/android/child_process_service.cc
index 5c50ec8..b06b0b4 100644
--- a/content/app/android/child_process_service.cc
+++ b/content/app/android/child_process_service.cc
@@ -10,9 +10,9 @@
 #include "base/android/jni_array.h"
 #include "base/logging.h"
 #include "base/posix/global_descriptors.h"
+#include "content/child/child_process.h"
+#include "content/child/child_thread.h"
 #include "content/common/android/surface_texture_peer.h"
-#include "content/common/child_process.h"
-#include "content/common/child_thread.h"
 #include "content/common/gpu/gpu_surface_lookup.h"
 #include "content/public/app/android_library_loader_hooks.h"
 #include "content/public/common/content_descriptors.h"
diff --git a/content/browser/DEPS b/content/browser/DEPS
index 5508eb0..4bc3f3c 100644
--- a/content/browser/DEPS
+++ b/content/browser/DEPS
@@ -2,6 +2,7 @@ include_rules = [
   "+content/gpu",  # For gpu_info_collector.h and in-process GPU
   "+content/port/browser",
   "+content/public/browser",
+  "+content/child/webkitplatformsupport_impl.h",  # For in-process webkit
   "+media/audio",  # For audio input for speech input feature.
   "+media/base",  # For Android JNI registration.
   "+sql",
diff --git a/content/browser/browser_main_runner.cc b/content/browser/browser_main_runner.cc
index 175b62f..7c4f549 100644
--- a/content/browser/browser_main_runner.cc
+++ b/content/browser/browser_main_runner.cc
@@ -13,15 +13,14 @@
 #include "base/metrics/statistics_recorder.h"
 #include "content/browser/browser_main_loop.h"
 #include "content/browser/notification_service_impl.h"
-#include "content/common/child_process.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
 
 #if defined(OS_WIN)
 #include "base/win/metro.h"
 #include "base/win/windows_version.h"
-#include "ui/base/win/scoped_ole_initializer.h"
 #include "ui/base/ime/win/tsf_bridge.h"
+#include "ui/base/win/scoped_ole_initializer.h"
 #endif
 
 bool g_exited_main_message_loop = false;
@@ -46,14 +45,6 @@ class BrowserMainRunnerImpl : public BrowserMainRunner {
     TRACE_EVENT0("startup", "BrowserMainRunnerImpl::Initialize")
     is_initialized_ = true;
 
-#if !defined(OS_IOS)
-    // ChildProcess:: is a misnomer unless you consider context.  Use
-    // of --wait-for-debugger only makes sense when Chrome itself is a
-    // child process (e.g. when launched by PyAuto).
-    if (parameters.command_line.HasSwitch(switches::kWaitForDebugger))
-      ChildProcess::WaitForDebugger("Browser");
-#endif  // !defined(OS_IOS)
-
 #if defined(OS_WIN)
     if (parameters.command_line.HasSwitch(
             switches::kEnableTextServicesFramework)) {
diff --git a/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.h b/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.h
index f62935e..d562b31 100644
--- a/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.h
+++ b/content/browser/in_process_webkit/browser_webkitplatformsupport_impl.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_BROWSER_IN_PROCESS_WEBKIT_BROWSER_WEBKITPLATFORMSUPPORT_IMPL_H_
 #define CONTENT_BROWSER_IN_PROCESS_WEBKIT_BROWSER_WEBKITPLATFORMSUPPORT_IMPL_H_
 
-#include "content/common/webkitplatformsupport_impl.h"
+#include "content/child/webkitplatformsupport_impl.h"
 #include "webkit/glue/webfileutilities_impl.h"
 
 namespace content {
diff --git a/content/browser/renderer_host/image_transport_factory.cc b/content/browser/renderer_host/image_transport_factory.cc
index eecbf3f..05d812d 100644
--- a/content/browser/renderer_host/image_transport_factory.cc
+++ b/content/browser/renderer_host/image_transport_factory.cc
@@ -26,7 +26,6 @@
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
-#include "content/common/webkitplatformsupport_impl.h"
 #include "content/public/common/content_switches.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "gpu/ipc/command_buffer_proxy.h"
diff --git a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc
index 0da0389..9b0db5e 100644
--- a/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc
+++ b/content/browser/renderer_host/java/java_bridge_dispatcher_host.cc
@@ -9,9 +9,9 @@
 #include "base/threading/thread.h"
 #include "content/browser/renderer_host/java/java_bridge_channel_host.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
+#include "content/child/child_process.h"
 #include "content/child/npobject_stub.h"
 #include "content/child/npobject_util.h"  // For CreateNPVariantParam()
-#include "content/common/child_process.h"
 #include "content/common/java_bridge_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
diff --git a/content/browser/renderer_host/render_sandbox_host_linux.cc b/content/browser/renderer_host/render_sandbox_host_linux.cc
index 97c9304..ebd8749 100644
--- a/content/browser/renderer_host/render_sandbox_host_linux.cc
+++ b/content/browser/renderer_host/render_sandbox_host_linux.cc
@@ -27,9 +27,9 @@
 #include "base/shared_memory.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
+#include "content/child/webkitplatformsupport_impl.h"
 #include "content/common/font_config_ipc_linux.h"
 #include "content/common/sandbox_linux.h"
-#include "content/common/webkitplatformsupport_impl.h"
 #include "skia/ext/skia_utils_base.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontInfo.h"
diff --git a/content/child/DEPS b/content/child/DEPS
new file mode 100644
index 0000000..03d257f
--- /dev/null
+++ b/content/child/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+components/tracing",
+]
diff --git a/content/common/child_histogram_message_filter.cc b/content/child/child_histogram_message_filter.cc
index 535d5a8..ec145f3 100644
--- a/content/common/child_histogram_message_filter.cc
+++ b/content/child/child_histogram_message_filter.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/child_histogram_message_filter.h"
+#include "content/child/child_histogram_message_filter.h"
 
 #include <ctype.h>
 
@@ -10,9 +10,9 @@
 #include "base/message_loop.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/pickle.h"
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
+#include "content/child/child_thread.h"
 #include "content/common/child_process_messages.h"
-#include "content/common/child_thread.h"
 
 namespace content {
 
diff --git a/content/common/child_histogram_message_filter.h b/content/child/child_histogram_message_filter.h
index 9339d8e..8442d45 100644
--- a/content/common/child_histogram_message_filter.h
+++ b/content/child/child_histogram_message_filter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMOM_CHILD_HISTOGRAM_MESSAGE_FILTER_H_
-#define CONTENT_COMMOM_CHILD_HISTOGRAM_MESSAGE_FILTER_H_
+#ifndef CONTENT_CHILD_HISTOGRAM_MESSAGE_FILTER_H_
+#define CONTENT_CHILD_HISTOGRAM_MESSAGE_FILTER_H_
 
 #include <string>
 #include <vector>
@@ -66,4 +66,4 @@ class ChildHistogramMessageFilter : public base::HistogramFlattener,
 
 }  // namespace content
 
-#endif  // CONTENT_COMMOM_CHILD_HISTOGRAM_MESSAGE_FILTER_H_
+#endif  // CONTENT_CHILD_HISTOGRAM_MESSAGE_FILTER_H_
diff --git a/content/common/child_process.cc b/content/child/child_process.cc
index e8293a4..ec475e2 100644
--- a/content/common/child_process.cc
+++ b/content/child/child_process.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
 
 #if defined(OS_POSIX) && !defined(OS_ANDROID)
 #include <signal.h>  // For SigUSR1Handler below.
@@ -14,7 +14,7 @@
 #include "base/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
-#include "content/common/child_thread.h"
+#include "content/child/child_thread.h"
 
 #if defined(OS_ANDROID)
 #include "base/debug/debugger.h"
diff --git a/content/common/child_process.h b/content/child/child_process.h
index 7fd03b8..fca4585d2 100644
--- a/content/common/child_process.h
+++ b/content/child/child_process.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_CHILD_PROCESS_H_
-#define CONTENT_COMMON_CHILD_PROCESS_H_
+#ifndef CONTENT_CHILD_CHILD_PROCESS_H_
+#define CONTENT_CHILD_CHILD_PROCESS_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/threading/thread.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/threading/thread.h"
 #include "content/common/content_export.h"
 
 namespace content {
@@ -76,4 +76,4 @@ class CONTENT_EXPORT ChildProcess {
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_CHILD_PROCESS_H_
+#endif  // CONTENT_CHILD_CHILD_PROCESS_H_
diff --git a/content/common/child_resource_message_filter.cc b/content/child/child_resource_message_filter.cc
index efdfd7c..af68164 100644
--- a/content/common/child_resource_message_filter.cc
+++ b/content/child/child_resource_message_filter.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/child_resource_message_filter.h"
+#include "content/child/child_resource_message_filter.h"
 
 #include "base/thread_task_runner_handle.h"
-#include "content/common/resource_dispatcher.h"
+#include "content/child/resource_dispatcher.h"
 #include "content/common/resource_messages.h"
 
 namespace content {
diff --git a/content/common/child_resource_message_filter.h b/content/child/child_resource_message_filter.h
index 5fa39b5..df820d6 100644
--- a/content/common/child_resource_message_filter.h
+++ b/content/child/child_resource_message_filter.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_CHILD_RESOURCE_MESSAGE_FILTER_H_
-#define CONTENT_COMMON_CHILD_RESOURCE_MESSAGE_FILTER_H_
+#ifndef CONTENT_CHILD_CHILD_RESOURCE_MESSAGE_FILTER_H_
+#define CONTENT_CHILD_CHILD_RESOURCE_MESSAGE_FILTER_H_
 
 #include "base/memory/ref_counted.h"
 #include "ipc/ipc_channel_proxy.h"
@@ -45,4 +45,4 @@ class ChildResourceMessageFilter : public IPC::ChannelProxy::MessageFilter {
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_CHILD_RESOURCE_MESSAGE_FILTER_H_
\ No newline at end of file
+#endif  // CONTENT_CHILD_CHILD_RESOURCE_MESSAGE_FILTER_H_
\ No newline at end of file
diff --git a/content/common/child_thread.cc b/content/child/child_thread.cc
index c09931b..ce9d935 100644
--- a/content/common/child_thread.cc
+++ b/content/child/child_thread.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/child_thread.h"
+#include "content/child/child_thread.h"
 
 #include "base/allocator/allocator_extension.h"
 #include "base/command_line.h"
@@ -12,15 +12,15 @@
 #include "base/string_util.h"
 #include "base/tracked_objects.h"
 #include "components/tracing/child_trace_message_filter.h"
-#include "content/common/child_histogram_message_filter.h"
-#include "content/common/child_process.h"
+#include "content/child/child_histogram_message_filter.h"
+#include "content/child/child_process.h"
+#include "content/child/child_resource_message_filter.h"
+#include "content/child/fileapi/file_system_dispatcher.h"
+#include "content/child/quota_dispatcher.h"
+#include "content/child/resource_dispatcher.h"
+#include "content/child/socket_stream_dispatcher.h"
+#include "content/child/thread_safe_sender.h"
 #include "content/common/child_process_messages.h"
-#include "content/common/child_resource_message_filter.h"
-#include "content/common/fileapi/file_system_dispatcher.h"
-#include "content/common/quota_dispatcher.h"
-#include "content/common/resource_dispatcher.h"
-#include "content/common/socket_stream_dispatcher.h"
-#include "content/common/thread_safe_sender.h"
 #include "content/public/common/content_switches.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/ipc_switches.h"
diff --git a/content/common/child_thread.h b/content/child/child_thread.h
index 4df9203..470cb5a 100644
--- a/content/common/child_thread.h
+++ b/content/child/child_thread.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_CHILD_THREAD_H_
-#define CONTENT_COMMON_CHILD_THREAD_H_
+#ifndef CONTENT_CHILD_CHILD_THREAD_H_
+#define CONTENT_CHILD_CHILD_THREAD_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ -190,4 +190,4 @@ class CONTENT_EXPORT ChildThread : public IPC::Listener, public IPC::Sender {
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_CHILD_THREAD_H_
+#endif  // CONTENT_CHILD_CHILD_THREAD_H_
diff --git a/content/common/database_util.cc b/content/child/database_util.cc
index d847881..61ec65b 100644
--- a/content/common/database_util.cc
+++ b/content/child/database_util.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/database_util.h"
+#include "content/child/database_util.h"
 
-#include "content/common/child_thread.h"
+#include "content/child/child_thread.h"
 #include "content/common/database_messages.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "third_party/WebKit/public/platform/WebString.h"
diff --git a/content/common/database_util.h b/content/child/database_util.h
index efba065..7508ca5 100644
--- a/content/common/database_util.h
+++ b/content/child/database_util.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_DATABASE_UTIL_H_
-#define CONTENT_COMMON_DATABASE_UTIL_H_
+#ifndef CONTENT_CHILD_DATABASE_UTIL_H_
+#define CONTENT_CHILD_DATABASE_UTIL_H_
 
 #include "webkit/glue/webkitplatformsupport_impl.h"
 
@@ -26,4 +26,4 @@ class DatabaseUtil {
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_DATABASE_UTIL_H_
+#endif  // CONTENT_CHILD_DATABASE_UTIL_H_
diff --git a/content/common/fileapi/file_system_dispatcher.cc b/content/child/fileapi/file_system_dispatcher.cc
index 1b19664..29ccc2a 100644
--- a/content/common/fileapi/file_system_dispatcher.cc
+++ b/content/child/fileapi/file_system_dispatcher.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/fileapi/file_system_dispatcher.h"
+#include "content/child/fileapi/file_system_dispatcher.h"
 
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/process.h"
-#include "content/common/child_thread.h"
+#include "content/child/child_thread.h"
 #include "content/common/fileapi/file_system_messages.h"
 
 namespace content {
diff --git a/content/common/fileapi/file_system_dispatcher.h b/content/child/fileapi/file_system_dispatcher.h
index cf15eeb..1f6d061 100644
--- a/content/common/fileapi/file_system_dispatcher.h
+++ b/content/child/fileapi/file_system_dispatcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_FILEAPI_FILE_SYSTEM_DISPATCHER_H_
-#define CONTENT_COMMON_FILEAPI_FILE_SYSTEM_DISPATCHER_H_
+#ifndef CONTENT_CHILD_FILEAPI_FILE_SYSTEM_DISPATCHER_H_
+#define CONTENT_CHILD_FILEAPI_FILE_SYSTEM_DISPATCHER_H_
 
 #include <string>
 #include <vector>
@@ -155,4 +155,4 @@ class FileSystemDispatcher : public IPC::Listener {
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_FILEAPI_FILE_SYSTEM_DISPATCHER_H_
+#endif  // CONTENT_CHILD_FILEAPI_FILE_SYSTEM_DISPATCHER_H_
diff --git a/content/child/fileapi/webfilesystem_impl.cc b/content/child/fileapi/webfilesystem_impl.cc
index 0e6ed21..97835e8 100644
--- a/content/child/fileapi/webfilesystem_impl.cc
+++ b/content/child/fileapi/webfilesystem_impl.cc
@@ -5,10 +5,10 @@
 #include "content/child/fileapi/webfilesystem_impl.h"
 
 #include "base/bind.h"
+#include "content/child/child_thread.h"
+#include "content/child/fileapi/file_system_dispatcher.h"
 #include "content/child/fileapi/webfilesystem_callback_adapters.h"
 #include "content/child/fileapi/webfilewriter_impl.h"
-#include "content/common/child_thread.h"
-#include "content/common/fileapi/file_system_dispatcher.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h"
 #include "third_party/WebKit/public/platform/WebFileInfo.h"
 #include "third_party/WebKit/public/platform/WebString.h"
diff --git a/content/child/fileapi/webfilewriter_impl.cc b/content/child/fileapi/webfilewriter_impl.cc
index dc37c99..4cc72e3 100644
--- a/content/child/fileapi/webfilewriter_impl.cc
+++ b/content/child/fileapi/webfilewriter_impl.cc
@@ -5,8 +5,8 @@
 #include "content/child/fileapi/webfilewriter_impl.h"
 
 #include "base/bind.h"
-#include "content/common/child_thread.h"
-#include "content/common/fileapi/file_system_dispatcher.h"
+#include "content/child/child_thread.h"
+#include "content/child/fileapi/file_system_dispatcher.h"
 
 namespace content {
 
diff --git a/content/child/indexed_db/indexed_db_dispatcher.cc b/content/child/indexed_db/indexed_db_dispatcher.cc
index 24c403d..3c164bf 100644
--- a/content/child/indexed_db/indexed_db_dispatcher.cc
+++ b/content/child/indexed_db/indexed_db_dispatcher.cc
@@ -8,9 +8,9 @@
 #include "base/lazy_instance.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread_local.h"
+#include "content/child/child_thread.h"
 #include "content/child/indexed_db/proxy_webidbcursor_impl.h"
 #include "content/child/indexed_db/proxy_webidbdatabase_impl.h"
-#include "content/common/child_thread.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
 #include "ipc/ipc_channel.h"
 #include "third_party/WebKit/public/platform/WebIDBDatabaseCallbacks.h"
diff --git a/content/child/indexed_db/indexed_db_message_filter.cc b/content/child/indexed_db/indexed_db_message_filter.cc
index 949c167..6c64a6d 100644
--- a/content/child/indexed_db/indexed_db_message_filter.cc
+++ b/content/child/indexed_db/indexed_db_message_filter.cc
@@ -8,8 +8,8 @@
 #include "base/location.h"
 #include "base/message_loop_proxy.h"
 #include "base/pickle.h"
+#include "content/child/child_thread.h"
 #include "content/child/indexed_db/indexed_db_dispatcher.h"
-#include "content/common/child_thread.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
 #include "webkit/glue/worker_task_runner.h"
 
diff --git a/content/child/indexed_db/proxy_webidbcursor_impl.cc b/content/child/indexed_db/proxy_webidbcursor_impl.cc
index 4afd8d9..823faf3 100644
--- a/content/child/indexed_db/proxy_webidbcursor_impl.cc
+++ b/content/child/indexed_db/proxy_webidbcursor_impl.cc
@@ -6,8 +6,8 @@
 
 #include <vector>
 
+#include "content/child/child_thread.h"
 #include "content/child/indexed_db/indexed_db_dispatcher.h"
-#include "content/common/child_thread.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
 
 using WebKit::WebData;
diff --git a/content/child/indexed_db/proxy_webidbdatabase_impl.cc b/content/child/indexed_db/proxy_webidbdatabase_impl.cc
index d120a85..286708f 100644
--- a/content/child/indexed_db/proxy_webidbdatabase_impl.cc
+++ b/content/child/indexed_db/proxy_webidbdatabase_impl.cc
@@ -6,8 +6,8 @@
 
 #include <vector>
 
+#include "content/child/child_thread.h"
 #include "content/child/indexed_db/indexed_db_dispatcher.h"
-#include "content/common/child_thread.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
 #include "third_party/WebKit/public/platform/WebIDBKeyPath.h"
 #include "third_party/WebKit/public/platform/WebIDBMetadata.h"
diff --git a/content/child/indexed_db/proxy_webidbfactory_impl.cc b/content/child/indexed_db/proxy_webidbfactory_impl.cc
index 42a561d..f102195 100644
--- a/content/child/indexed_db/proxy_webidbfactory_impl.cc
+++ b/content/child/indexed_db/proxy_webidbfactory_impl.cc
@@ -4,8 +4,8 @@
 
 #include "content/child/indexed_db/proxy_webidbfactory_impl.h"
 
+#include "content/child/child_thread.h"
 #include "content/child/indexed_db/indexed_db_dispatcher.h"
-#include "content/common/child_thread.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 
 using WebKit::WebIDBCallbacks;
diff --git a/content/common/quota_dispatcher.cc b/content/child/quota_dispatcher.cc
index ac45e1d..5741449 100644
--- a/content/common/quota_dispatcher.cc
+++ b/content/child/quota_dispatcher.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/quota_dispatcher.h"
+#include "content/child/quota_dispatcher.h"
 
 #include "base/basictypes.h"
-#include "content/common/child_thread.h"
+#include "content/child/child_thread.h"
 #include "content/common/quota_messages.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageQuotaCallbacks.h"
diff --git a/content/common/quota_dispatcher.h b/content/child/quota_dispatcher.h
index 391ab4f..a2fbfcc 100644
--- a/content/common/quota_dispatcher.h
+++ b/content/child/quota_dispatcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_QUOTA_DISPATCHER_H_
-#define CONTENT_COMMON_QUOTA_DISPATCHER_H_
+#ifndef CONTENT_CHILD_QUOTA_DISPATCHER_H_
+#define CONTENT_CHILD_QUOTA_DISPATCHER_H_
 
 #include <map>
 #include <set>
@@ -73,4 +73,4 @@ class QuotaDispatcher : public IPC::Listener {
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_QUOTA_DISPATCHER_H_
+#endif  // CONTENT_CHILD_QUOTA_DISPATCHER_H_
diff --git a/content/common/resource_dispatcher.cc b/content/child/resource_dispatcher.cc
index a357372..98a2243 100644
--- a/content/common/resource_dispatcher.cc
+++ b/content/child/resource_dispatcher.cc
@@ -4,7 +4,7 @@
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
-#include "content/common/resource_dispatcher.h"
+#include "content/child/resource_dispatcher.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
diff --git a/content/common/resource_dispatcher.h b/content/child/resource_dispatcher.h
index 21c3690..64843e4 100644
--- a/content/common/resource_dispatcher.h
+++ b/content/child/resource_dispatcher.h
@@ -4,8 +4,8 @@
 
 // See http://dev.chromium.org/developers/design-documents/multi-process-resource-loading
 
-#ifndef CONTENT_COMMON_RESOURCE_DISPATCHER_H_
-#define CONTENT_COMMON_RESOURCE_DISPATCHER_H_
+#ifndef CONTENT_CHILD_RESOURCE_DISPATCHER_H_
+#define CONTENT_CHILD_RESOURCE_DISPATCHER_H_
 
 #include <deque>
 #include <string>
@@ -198,4 +198,4 @@ class CONTENT_EXPORT ResourceDispatcher : public IPC::Listener {
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_RESOURCE_DISPATCHER_H_
+#endif  // CONTENT_CHILD_RESOURCE_DISPATCHER_H_
diff --git a/content/common/resource_dispatcher_unittest.cc b/content/child/resource_dispatcher_unittest.cc
index f00b89f..9621bbe 100644
--- a/content/common/resource_dispatcher_unittest.cc
+++ b/content/child/resource_dispatcher_unittest.cc
@@ -9,8 +9,8 @@
 #include "base/message_loop.h"
 #include "base/process.h"
 #include "base/process_util.h"
+#include "content/child/resource_dispatcher.h"
 #include "content/common/request_extra_data.h"
-#include "content/common/resource_dispatcher.h"
 #include "content/common/resource_messages.h"
 #include "content/public/common/resource_response.h"
 #include "net/base/net_errors.h"
diff --git a/content/common/socket_stream_dispatcher.cc b/content/child/socket_stream_dispatcher.cc
index 0d35135..912360c 100644
--- a/content/common/socket_stream_dispatcher.cc
+++ b/content/child/socket_stream_dispatcher.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/socket_stream_dispatcher.h"
+#include "content/child/socket_stream_dispatcher.h"
 
 #include <vector>
 
@@ -13,7 +13,7 @@
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
-#include "content/common/child_thread.h"
+#include "content/child/child_thread.h"
 #include "content/common/socket_stream.h"
 #include "content/common/socket_stream_handle_data.h"
 #include "content/common/socket_stream_messages.h"
diff --git a/content/common/socket_stream_dispatcher.h b/content/child/socket_stream_dispatcher.h
index b619623..ba23c80 100644
--- a/content/common/socket_stream_dispatcher.h
+++ b/content/child/socket_stream_dispatcher.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_SOCKET_STREAM_DISPATCHER_H_
-#define CONTENT_COMMON_SOCKET_STREAM_DISPATCHER_H_
+#ifndef CONTENT_CHILD_SOCKET_STREAM_DISPATCHER_H_
+#define CONTENT_CHILD_SOCKET_STREAM_DISPATCHER_H_
 
 #include <vector>
 
@@ -50,4 +50,4 @@ class SocketStreamDispatcher : public IPC::Listener {
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_SOCKET_STREAM_DISPATCHER_H_
+#endif  // CONTENT_CHILD_SOCKET_STREAM_DISPATCHER_H_
diff --git a/content/common/thread_safe_sender.cc b/content/child/thread_safe_sender.cc
index 89a7cd8..65a95d5 100644
--- a/content/common/thread_safe_sender.cc
+++ b/content/child/thread_safe_sender.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/thread_safe_sender.h"
+#include "content/child/thread_safe_sender.h"
 
 #include "base/message_loop_proxy.h"
-#include "content/common/child_thread.h"
+#include "content/child/child_thread.h"
 #include "ipc/ipc_sync_message_filter.h"
 
 namespace content {
diff --git a/content/common/thread_safe_sender.h b/content/child/thread_safe_sender.h
index a7da56c..bbef681 100644
--- a/content/common/thread_safe_sender.h
+++ b/content/child/thread_safe_sender.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_THREAD_SAFE_SENDER_H_
-#define CONTENT_COMMON_THREAD_SAFE_SENDER_H_
+#ifndef CONTENT_CHILD_THREAD_SAFE_SENDER_H_
+#define CONTENT_CHILD_THREAD_SAFE_SENDER_H_
 
 #include "base/memory/ref_counted.h"
 #include "ipc/ipc_sender.h"
@@ -42,4 +42,4 @@ class ThreadSafeSender
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_THREAD_SAFE_SENDER_H_
+#endif  // CONTENT_CHILD_THREAD_SAFE_SENDER_H_
diff --git a/content/child/webblobregistry_impl.cc b/content/child/webblobregistry_impl.cc
index b70b883..745b595 100644
--- a/content/child/webblobregistry_impl.cc
+++ b/content/child/webblobregistry_impl.cc
@@ -7,9 +7,9 @@
 #include "base/memory/ref_counted.h"
 #include "base/message_loop.h"
 #include "base/shared_memory.h"
-#include "content/common/child_thread.h"
+#include "content/child/child_thread.h"
+#include "content/child/thread_safe_sender.h"
 #include "content/common/fileapi/webblob_messages.h"
-#include "content/common/thread_safe_sender.h"
 #include "third_party/WebKit/public/platform/WebBlobData.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
diff --git a/content/common/webkitplatformsupport_impl.cc b/content/child/webkitplatformsupport_impl.cc
index a39e27e..99434bd 100644
--- a/content/common/webkitplatformsupport_impl.cc
+++ b/content/child/webkitplatformsupport_impl.cc
@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 #include "base/command_line.h"
-#include "content/common/child_thread.h"
-#include "content/common/socket_stream_dispatcher.h"
-#include "content/common/webkitplatformsupport_impl.h"
+#include "content/child/child_thread.h"
+#include "content/child/socket_stream_dispatcher.h"
+#include "content/child/webkitplatformsupport_impl.h"
 #include "content/public/common/content_client.h"
 #include "googleurl/src/gurl.h"
 
diff --git a/content/common/webkitplatformsupport_impl.h b/content/child/webkitplatformsupport_impl.h
index c56ed05..a567509 100644
--- a/content/common/webkitplatformsupport_impl.h
+++ b/content/child/webkitplatformsupport_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_CONTENT_WEBKITPLATFORMSUPPORT_IMPL_H_
-#define CONTENT_COMMON_CONTENT_WEBKITPLATFORMSUPPORT_IMPL_H_
+#ifndef CONTENT_CHILD_WEBKITPLATFORMSUPPORT_IMPL_H_
+#define CONTENT_CHILD_WEBKITPLATFORMSUPPORT_IMPL_H_
 
 #include "base/compiler_specific.h"
 #include "content/common/content_export.h"
@@ -42,4 +42,4 @@ class CONTENT_EXPORT WebKitPlatformSupportImpl
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_CONTENT_WEBKITPLATFORMSUPPORT_IMPL_H_
+#endif  // CONTENT_CHILD_WEBKITPLATFORMSUPPORT_IMPL_H_
diff --git a/content/common/webmessageportchannel_impl.cc b/content/child/webmessageportchannel_impl.cc
index 3db2cf4..98048c1 100644
--- a/content/common/webmessageportchannel_impl.cc
+++ b/content/child/webmessageportchannel_impl.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/webmessageportchannel_impl.h"
+#include "content/child/webmessageportchannel_impl.h"
 
 #include "base/bind.h"
-#include "content/common/child_process.h"
-#include "content/common/child_thread.h"
+#include "content/child/child_process.h"
+#include "content/child/child_thread.h"
 #include "content/common/worker_messages.h"
 #include "third_party/WebKit/public/platform/WebMessagePortChannelClient.h"
 #include "third_party/WebKit/public/platform/WebString.h"
diff --git a/content/common/webmessageportchannel_impl.h b/content/child/webmessageportchannel_impl.h
index 2efd2b8..dabf239 100644
--- a/content/common/webmessageportchannel_impl.h
+++ b/content/child/webmessageportchannel_impl.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_COMMON_WEBMESSAGEPORTCHANNEL_IMPL_H_
-#define CONTENT_COMMON_WEBMESSAGEPORTCHANNEL_IMPL_H_
+#ifndef CONTENT_CHILD_WEBMESSAGEPORTCHANNEL_IMPL_H_
+#define CONTENT_CHILD_WEBMESSAGEPORTCHANNEL_IMPL_H_
 
 #include <queue>
 #include <vector>
@@ -78,4 +78,4 @@ class WebMessagePortChannelImpl
 
 }  // namespace content
 
-#endif  // CONTENT_COMMON_WEBMESSAGEPORTCHANNEL_IMPL_H_
+#endif  // CONTENT_CHILD_WEBMESSAGEPORTCHANNEL_IMPL_H_
diff --git a/content/common/DEPS b/content/common/DEPS
index f2d5ebd..6a86dd1 100644
--- a/content/common/DEPS
+++ b/content/common/DEPS
@@ -1,6 +1,5 @@
 include_rules = [
   "+cc",
-  "+components/tracing",
   "+media/audio",
   "+media/base",
   "-webkit/browser",
diff --git a/content/common/gpu/DEPS b/content/common/gpu/DEPS
index 7e5f40b..c3fb3ab 100644
--- a/content/common/gpu/DEPS
+++ b/content/common/gpu/DEPS
@@ -7,4 +7,7 @@ include_rules = [
   "+third_party/angle/include",
   "+third_party/openmax",
   "+third_party/mesa",
+
+  # For single process mode
+  "+content/child/child_thread.h",
 ]
diff --git a/content/common/gpu/gpu_channel.cc b/content/common/gpu/gpu_channel.cc
index 47ef904..a3b27d8 100644
--- a/content/common/gpu/gpu_channel.cc
+++ b/content/common/gpu/gpu_channel.cc
@@ -19,7 +19,6 @@
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "base/timer.h"
-#include "content/common/child_process.h"
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/gpu/sync_point_manager.h"
diff --git a/content/common/gpu/gpu_channel_manager.cc b/content/common/gpu/gpu_channel_manager.cc
index c0747ec..8c040c2 100644
--- a/content/common/gpu/gpu_channel_manager.cc
+++ b/content/common/gpu/gpu_channel_manager.cc
@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "base/command_line.h"
-#include "content/common/child_thread.h"
+#include "content/child/child_thread.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_memory_manager.h"
 #include "content/common/gpu/gpu_messages.h"
diff --git a/content/common/gpu/media/vaapi_video_decode_accelerator.cc b/content/common/gpu/media/vaapi_video_decode_accelerator.cc
index a99067f..b3251d1 100644
--- a/content/common/gpu/media/vaapi_video_decode_accelerator.cc
+++ b/content/common/gpu/media/vaapi_video_decode_accelerator.cc
@@ -9,7 +9,7 @@
 #include "base/stl_util.h"
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
-#include "content/common/child_thread.h"
+#include "content/child/child_thread.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/media/vaapi_video_decode_accelerator.h"
 #include "media/base/bind_to_loop.h"
diff --git a/content/content_child.gypi b/content/content_child.gypi
index a66987e..85ac385 100644
--- a/content/content_child.gypi
+++ b/content/content_child.gypi
@@ -16,6 +16,18 @@
     '../base/base.gyp:base',
   ],
   'sources': [
+    'child/child_histogram_message_filter.cc',
+    'child/child_histogram_message_filter.h',
+    'child/child_process.cc',
+    'child/child_process.h',
+    'child/child_resource_message_filter.cc',
+    'child/child_resource_message_filter.h',
+    'child/child_thread.cc',
+    'child/child_thread.h',
+    'child/database_util.cc',
+    'child/database_util.h',
+    'child/fileapi/file_system_dispatcher.cc',
+    'child/fileapi/file_system_dispatcher.h',
     'child/fileapi/webfilesystem_callback_adapters.cc',
     'child/fileapi/webfilesystem_callback_adapters.h',
     'child/fileapi/webfilesystem_impl.cc',
@@ -46,10 +58,22 @@
     'child/plugin_messages.h',
     'child/plugin_param_traits.cc',
     'child/plugin_param_traits.h',
-    'child/web_database_observer_impl.cc',
-    'child/web_database_observer_impl.h',
+    'child/quota_dispatcher.cc',
+    'child/quota_dispatcher.h',
+    'child/resource_dispatcher.cc',
+    'child/resource_dispatcher.h',
+    'child/socket_stream_dispatcher.cc',
+    'child/socket_stream_dispatcher.h',
+    'child/thread_safe_sender.cc',
+    'child/thread_safe_sender.h',
     'child/webblobregistry_impl.cc',
     'child/webblobregistry_impl.h',
+    'child/web_database_observer_impl.cc',
+    'child/web_database_observer_impl.h',
+    'child/webkitplatformsupport_impl.cc',
+    'child/webkitplatformsupport_impl.h',
+    'child/webmessageportchannel_impl.cc',
+    'child/webmessageportchannel_impl.h',
   ],
   'conditions': [
     ['OS=="ios"', {
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 7a60b84..70b4e09 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -132,20 +132,12 @@
     'common/browser_rendering_stats.h',
     'common/cc_messages.cc',
     'common/cc_messages.h',
-    'common/child_histogram_message_filter.cc',
-    'common/child_histogram_message_filter.h',
-    'common/child_process.cc',
-    'common/child_process.h',
     'common/child_process_host_impl.cc',
     'common/child_process_host_impl.h',
     'common/child_process_messages.h',
     'common/child_process_sandbox_support_impl_linux.cc',
     'common/child_process_sandbox_support_impl_linux.h',
     'common/child_process_sandbox_support_impl_shm_linux.cc',
-    'common/child_resource_message_filter.cc',
-    'common/child_resource_message_filter.h',
-    'common/child_thread.cc',
-    'common/child_thread.h',
     'common/clipboard_messages.cc',
     'common/clipboard_messages.h',
     'common/content_constants_internal.cc',
@@ -159,8 +151,6 @@
     'common/content_param_traits_macros.h',
     'common/content_paths.cc',
     'common/database_messages.h',
-    'common/database_util.cc',
-    'common/database_util.h',
     'common/db_message_filter.cc',
     'common/db_message_filter.h',
     'common/desktop_notification_messages.h',
@@ -173,8 +163,6 @@
     'common/drag_traits.h',
     'common/edit_command.h',
     'common/file_utilities_messages.h',
-    'common/fileapi/file_system_dispatcher.cc',
-    'common/fileapi/file_system_dispatcher.h',
     'common/fileapi/file_system_messages.h',
     'common/fileapi/webblob_messages.h',
     'common/find_match_rect_android.cc',
@@ -302,12 +290,8 @@
     'common/plugin_process_messages.h',
     'common/process_type.cc',
     'common/quota_messages.h',
-    'common/quota_dispatcher.cc',
-    'common/quota_dispatcher.h',
     'common/request_extra_data.cc',
     'common/request_extra_data.h',
-    'common/resource_dispatcher.cc',
-    'common/resource_dispatcher.h',
     'common/resource_messages.cc',
     'common/resource_messages.h',
     'common/sandbox_init_mac.cc',
@@ -330,8 +314,6 @@
     'common/set_process_title_linux.cc',
     'common/set_process_title_linux.h',
     'common/socket_stream.h',
-    'common/socket_stream_dispatcher.cc',
-    'common/socket_stream_dispatcher.h',
     'common/socket_stream_handle_data.cc',
     'common/socket_stream_handle_data.h',
     'common/socket_stream_messages.h',
@@ -340,18 +322,12 @@
     'common/ssl_status_serialization.h',
     'common/swapped_out_messages.cc',
     'common/swapped_out_messages.h',
-    'common/thread_safe_sender.cc',
-    'common/thread_safe_sender.h',
     'common/text_input_client_messages.h',
     'common/url_schemes.cc',
     'common/url_schemes.h',
     'common/utility_messages.h',
     'common/view_messages.h',
     'common/view_message_enums.h',
-    'common/webkitplatformsupport_impl.cc',
-    'common/webkitplatformsupport_impl.h',
-    'common/webmessageportchannel_impl.cc',
-    'common/webmessageportchannel_impl.h',
     'common/worker_messages.h',
     'common/zygote_commands_linux.h',
     'port/common/input_event_ack_state.h',
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 32a3eb5..55864af 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -363,22 +363,22 @@
         'browser/web_contents/web_drag_source_mac_unittest.mm',
         'browser/webui/web_ui_data_source_unittest.cc',
         'browser/webui/web_ui_message_handler_unittest.cc',
+        'child/indexed_db/indexed_db_dispatcher_unittest.cc',
+        'child/indexed_db/proxy_webidbcursor_impl_unittest.cc',
+        'child/resource_dispatcher_unittest.cc',
         'common/android/address_parser_unittest.cc',
         'common/cc_messages_unittest.cc',
         'common/common_param_traits_unittest.cc',
-        'common/mac/attributed_string_coder_unittest.mm',
-        'common/mac/font_descriptor_unittest.mm',
         'common/gpu/gpu_memory_manager_unittest.cc',
         'common/inter_process_time_ticks_converter_unittest.cc',
+        'common/mac/attributed_string_coder_unittest.mm',
+        'common/mac/font_descriptor_unittest.mm',
         'common/page_zoom_unittest.cc',
-        'common/resource_dispatcher_unittest.cc',
         'common/sandbox_mac_diraccess_unittest.mm',
         'common/sandbox_mac_fontloading_unittest.mm',
         'common/sandbox_mac_system_access_unittest.mm',
         'common/sandbox_mac_unittest_helper.h',
         'common/sandbox_mac_unittest_helper.mm',
-        'child/indexed_db/indexed_db_dispatcher_unittest.cc',
-        'child/indexed_db/proxy_webidbcursor_impl_unittest.cc',
         'renderer/active_notification_tracker_unittest.cc',
         'renderer/android/email_detector_unittest.cc',
         'renderer/android/phone_number_detector_unittest.cc',
diff --git a/content/gpu/DEPS b/content/gpu/DEPS
index b17f125..1831675 100644
--- a/content/gpu/DEPS
+++ b/content/gpu/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+content/child",
   "+libEGL",
   "+libGLESv2",
   "+sandbox",
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
index 451e31c..c563999 100644
--- a/content/gpu/gpu_child_thread.cc
+++ b/content/gpu/gpu_child_thread.cc
@@ -11,7 +11,7 @@
 #include "base/command_line.h"
 #include "base/threading/worker_pool.h"
 #include "build/build_config.h"
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/gpu/gpu_watchdog_thread.h"
 #include "content/public/common/content_client.h"
diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h
index d6b4ba3..4d40f9d 100644
--- a/content/gpu/gpu_child_thread.h
+++ b/content/gpu/gpu_child_thread.h
@@ -13,7 +13,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "build/build_config.h"
-#include "content/common/child_thread.h"
+#include "content/child/child_thread.h"
 #include "content/common/gpu/gpu_channel.h"
 #include "content/common/gpu/gpu_channel_manager.h"
 #include "content/common/gpu/gpu_config.h"
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 2bfd51f..82626fb 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -15,6 +15,7 @@
 #include "base/stringprintf.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
+#include "content/child/child_process.h"
 #include "content/common/gpu/gpu_config.h"
 #include "content/common/sandbox_linux.h"
 #include "content/gpu/gpu_child_thread.h"
diff --git a/content/gpu/gpu_process.h b/content/gpu/gpu_process.h
index 5d59305..f4db71e 100644
--- a/content/gpu/gpu_process.h
+++ b/content/gpu/gpu_process.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_GPU_GPU_PROCESS_H_
 #define CONTENT_GPU_GPU_PROCESS_H_
 
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
 
 namespace content {
 
diff --git a/content/plugin/plugin_channel.cc b/content/plugin/plugin_channel.cc
index cf20c3c..d1423b4 100644
--- a/content/plugin/plugin_channel.cc
+++ b/content/plugin/plugin_channel.cc
@@ -11,8 +11,8 @@
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "build/build_config.h"
+#include "content/child/child_process.h"
 #include "content/child/plugin_messages.h"
-#include "content/common/child_process.h"
 #include "content/common/plugin_process_messages.h"
 #include "content/plugin/plugin_thread.h"
 #include "content/plugin/webplugin_delegate_stub.h"
diff --git a/content/plugin/plugin_main.cc b/content/plugin/plugin_main.cc
index 298fbd4..8a96d8f 100644
--- a/content/plugin/plugin_main.cc
+++ b/content/plugin/plugin_main.cc
@@ -12,10 +12,10 @@
 #include "base/command_line.h"
 #include "base/hi_res_timer_manager.h"
 #include "base/message_loop.h"
-#include "base/string_util.h"
 #include "base/power_monitor/power_monitor.h"
+#include "base/string_util.h"
 #include "base/threading/platform_thread.h"
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
 #include "content/plugin/plugin_thread.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc
index fdb46b5..3bb76af 100644
--- a/content/plugin/plugin_thread.cc
+++ b/content/plugin/plugin_thread.cc
@@ -20,8 +20,8 @@
 #include "base/lazy_instance.h"
 #include "base/process_util.h"
 #include "base/threading/thread_local.h"
+#include "content/child/child_process.h"
 #include "content/child/npobject_util.h"
-#include "content/common/child_process.h"
 #include "content/common/plugin_process_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/plugin/content_plugin_client.h"
diff --git a/content/plugin/plugin_thread.h b/content/plugin/plugin_thread.h
index 86c9b2d..bf4a570 100644
--- a/content/plugin/plugin_thread.h
+++ b/content/plugin/plugin_thread.h
@@ -8,7 +8,7 @@
 #include "base/files/file_path.h"
 #include "base/native_library.h"
 #include "build/build_config.h"
-#include "content/common/child_thread.h"
+#include "content/child/child_thread.h"
 #include "content/plugin/plugin_channel.h"
 #include "webkit/plugins/npapi/plugin_lib.h"
 
diff --git a/content/ppapi_plugin/DEPS b/content/ppapi_plugin/DEPS
index a7bbdfc..bde9e92 100644
--- a/content/ppapi_plugin/DEPS
+++ b/content/ppapi_plugin/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+content/child",
   "+content/public/plugin",
   "+ppapi/c",
   "+ppapi/proxy",
diff --git a/content/ppapi_plugin/broker_process_dispatcher.cc b/content/ppapi_plugin/broker_process_dispatcher.cc
index 8a84a2c..9cd36bb 100644
--- a/content/ppapi_plugin/broker_process_dispatcher.cc
+++ b/content/ppapi_plugin/broker_process_dispatcher.cc
@@ -8,7 +8,7 @@
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/private/ppp_flash_browser_operations.h"
 #include "ppapi/proxy/ppapi_messages.h"
diff --git a/content/ppapi_plugin/plugin_process_dispatcher.cc b/content/ppapi_plugin/plugin_process_dispatcher.cc
index 12fe91b..b0574d4 100644
--- a/content/ppapi_plugin/plugin_process_dispatcher.cc
+++ b/content/ppapi_plugin/plugin_process_dispatcher.cc
@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
 
 namespace content {
 namespace {
diff --git a/content/ppapi_plugin/ppapi_broker_main.cc b/content/ppapi_plugin/ppapi_broker_main.cc
index e2c6097..0fd01f8 100644
--- a/content/ppapi_plugin/ppapi_broker_main.cc
+++ b/content/ppapi_plugin/ppapi_broker_main.cc
@@ -5,7 +5,7 @@
 #include "base/message_loop.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
 #include "content/ppapi_plugin/ppapi_thread.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
diff --git a/content/ppapi_plugin/ppapi_plugin_main.cc b/content/ppapi_plugin/ppapi_plugin_main.cc
index 25ea26e..ca73f49 100644
--- a/content/ppapi_plugin/ppapi_plugin_main.cc
+++ b/content/ppapi_plugin/ppapi_plugin_main.cc
@@ -8,7 +8,7 @@
 #include "base/message_loop.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
 #include "content/common/sandbox_linux.h"
 #include "content/ppapi_plugin/ppapi_thread.h"
 #include "content/public/common/content_client.h"
diff --git a/content/ppapi_plugin/ppapi_thread.cc b/content/ppapi_plugin/ppapi_thread.cc
index 4f4be32..222ac11 100644
--- a/content/ppapi_plugin/ppapi_thread.cc
+++ b/content/ppapi_plugin/ppapi_thread.cc
@@ -16,7 +16,7 @@
 #include "base/threading/platform_thread.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/sandbox_util.h"
 #include "content/ppapi_plugin/broker_process_dispatcher.h"
@@ -33,9 +33,9 @@
 #include "ppapi/c/dev/ppp_network_state_dev.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/ppp.h"
+#include "ppapi/proxy/interface_list.h"
 #include "ppapi/proxy/plugin_globals.h"
 #include "ppapi/proxy/ppapi_messages.h"
-#include "ppapi/proxy/interface_list.h"
 #include "ppapi/shared_impl/api_id.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "ui/base/ui_base_switches.h"
diff --git a/content/ppapi_plugin/ppapi_thread.h b/content/ppapi_plugin/ppapi_thread.h
index 7faff6b..9fb56c1 100644
--- a/content/ppapi_plugin/ppapi_thread.h
+++ b/content/ppapi_plugin/ppapi_thread.h
@@ -14,7 +14,7 @@
 #include "base/process.h"
 #include "base/scoped_native_library.h"
 #include "build/build_config.h"
-#include "content/common/child_thread.h"
+#include "content/child/child_thread.h"
 #include "ipc/ipc_listener.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/c/trusted/ppp_broker.h"
diff --git a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc
index 814ab6d..7106386 100644
--- a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc
+++ b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.cc
@@ -6,12 +6,12 @@
 
 #include <map>
 
-#include "base/synchronization/lock.h"
 #include "base/logging.h"
 #include "base/string16.h"
+#include "base/synchronization/lock.h"
 #include "build/build_config.h"
+#include "content/child/child_thread.h"
 #include "content/common/child_process_messages.h"
-#include "content/common/child_thread.h"
 #include "ppapi/proxy/plugin_globals.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 
diff --git a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h
index 7a1a448..3ed674c 100644
--- a/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h
+++ b/content/ppapi_plugin/ppapi_webkitplatformsupport_impl.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
-#include "content/common/webkitplatformsupport_impl.h"
+#include "content/child/webkitplatformsupport_impl.h"
 
 namespace content {
 
diff --git a/content/renderer/java/java_bridge_channel.cc b/content/renderer/java/java_bridge_channel.cc
index fa4533e..7d95421 100644
--- a/content/renderer/java/java_bridge_channel.cc
+++ b/content/renderer/java/java_bridge_channel.cc
@@ -4,8 +4,8 @@
 
 #include "content/renderer/java/java_bridge_channel.h"
 
+#include "content/child/child_process.h"
 #include "content/child/plugin_messages.h"
-#include "content/common/child_process.h"
 #include "content/common/java_bridge_messages.h"
 
 namespace content {
diff --git a/content/renderer/java/java_bridge_dispatcher.cc b/content/renderer/java/java_bridge_dispatcher.cc
index ffab104..bab01d2 100644
--- a/content/renderer/java/java_bridge_dispatcher.cc
+++ b/content/renderer/java/java_bridge_dispatcher.cc
@@ -4,8 +4,8 @@
 
 #include "content/renderer/java/java_bridge_dispatcher.h"
 
+#include "content/child/child_process.h"
 #include "content/child/npobject_util.h"  // For CreateNPVariant()
-#include "content/common/child_process.h"
 #include "content/common/java_bridge_messages.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
diff --git a/content/renderer/media/pepper_platform_video_decoder_impl.cc b/content/renderer/media/pepper_platform_video_decoder_impl.cc
index d305ffa..9fe3798 100644
--- a/content/renderer/media/pepper_platform_video_decoder_impl.cc
+++ b/content/renderer/media/pepper_platform_video_decoder_impl.cc
@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/renderer/render_thread_impl.h"
 
diff --git a/content/renderer/media/renderer_gpu_video_decoder_factories.cc b/content/renderer/media/renderer_gpu_video_decoder_factories.cc
index b3f8c72..2a59e67 100644
--- a/content/renderer/media/renderer_gpu_video_decoder_factories.cc
+++ b/content/renderer/media/renderer_gpu_video_decoder_factories.cc
@@ -8,7 +8,7 @@
 #include <GLES2/gl2ext.h>
 
 #include "base/bind.h"
-#include "content/common/child_thread.h"
+#include "content/child/child_thread.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
diff --git a/content/renderer/media/video_capture_impl.cc b/content/renderer/media/video_capture_impl.cc
index 1382c8f..c6b7bf2 100644
--- a/content/renderer/media/video_capture_impl.cc
+++ b/content/renderer/media/video_capture_impl.cc
@@ -6,7 +6,7 @@
 
 #include "base/bind.h"
 #include "base/stl_util.h"
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
 #include "content/common/media/video_capture_messages.h"
 #include "media/base/limits.h"
 
diff --git a/content/renderer/media/video_capture_impl_unittest.cc b/content/renderer/media/video_capture_impl_unittest.cc
index b158b45..8befed0 100644
--- a/content/renderer/media/video_capture_impl_unittest.cc
+++ b/content/renderer/media/video_capture_impl_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/message_loop.h"
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
 #include "content/common/media/video_capture_messages.h"
 #include "content/renderer/media/video_capture_impl.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/content/renderer/media/webrtc_audio_capturer.cc b/content/renderer/media/webrtc_audio_capturer.cc
index 0f35b4f..7ab1af8 100644
--- a/content/renderer/media/webrtc_audio_capturer.cc
+++ b/content/renderer/media/webrtc_audio_capturer.cc
@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
 #include "content/renderer/media/audio_device_factory.h"
 #include "content/renderer/media/webrtc_audio_capturer_sink_owner.h"
 #include "content/renderer/media/webrtc_audio_device_impl.h"
diff --git a/content/renderer/p2p/socket_dispatcher.cc b/content/renderer/p2p/socket_dispatcher.cc
index 7bb7444..e0812ce 100644
--- a/content/renderer/p2p/socket_dispatcher.cc
+++ b/content/renderer/p2p/socket_dispatcher.cc
@@ -7,7 +7,7 @@
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop_proxy.h"
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
 #include "content/common/p2p_messages.h"
 #include "content/renderer/p2p/host_address_request.h"
 #include "content/renderer/p2p/socket_client.h"
diff --git a/content/renderer/pepper/pepper_file_system_host.cc b/content/renderer/pepper/pepper_file_system_host.cc
index 79d1be6..6098db6 100644
--- a/content/renderer/pepper/pepper_file_system_host.cc
+++ b/content/renderer/pepper/pepper_file_system_host.cc
@@ -6,8 +6,8 @@
 
 #include "base/bind.h"
 #include "base/callback.h"
-#include "content/common/child_thread.h"
-#include "content/common/fileapi/file_system_dispatcher.h"
+#include "content/child/child_thread.h"
+#include "content/child/fileapi/file_system_dispatcher.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/renderer_ppapi_host.h"
 #include "ppapi/c/pp_errors.h"
diff --git a/content/renderer/pepper/pepper_platform_audio_input_impl.cc b/content/renderer/pepper/pepper_platform_audio_input_impl.cc
index 87afb09..1a3398e 100644
--- a/content/renderer/pepper/pepper_platform_audio_input_impl.cc
+++ b/content/renderer/pepper/pepper_platform_audio_input_impl.cc
@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "build/build_config.h"
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
 #include "content/renderer/media/audio_input_message_filter.h"
 #include "content/renderer/pepper/pepper_plugin_delegate_impl.h"
 #include "content/renderer/render_thread_impl.h"
diff --git a/content/renderer/pepper/pepper_platform_audio_output_impl.cc b/content/renderer/pepper/pepper_platform_audio_output_impl.cc
index 05600dd..60b5d92 100644
--- a/content/renderer/pepper/pepper_platform_audio_output_impl.cc
+++ b/content/renderer/pepper/pepper_platform_audio_output_impl.cc
@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
 #include "build/build_config.h"
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
 #include "content/common/media/audio_messages.h"
 #include "content/renderer/media/audio_message_filter.h"
 #include "content/renderer/render_thread_impl.h"
diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
index 5840837..bc9fbf1 100644
--- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
@@ -18,16 +18,16 @@
 #include "base/strings/string_split.h"
 #include "base/sync_socket.h"
 #include "base/time.h"
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
+#include "content/child/child_thread.h"
+#include "content/child/fileapi/file_system_dispatcher.h"
+#include "content/child/quota_dispatcher.h"
 #include "content/common/child_process_messages.h"
-#include "content/common/child_thread.h"
-#include "content/common/fileapi/file_system_dispatcher.h"
 #include "content/common/fileapi/file_system_messages.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/common/pepper_messages.h"
 #include "content/common/pepper_plugin_registry.h"
-#include "content/common/quota_dispatcher.h"
 #include "content/common/sandbox_util.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_switches.h"
diff --git a/content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc b/content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc
index 2225314..738a324 100644
--- a/content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc
+++ b/content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc
@@ -4,7 +4,7 @@
 
 #include "content/renderer/pepper/pepper_proxy_channel_delegate_impl.h"
 
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
 #include "content/common/sandbox_util.h"
 
 namespace content {
diff --git a/content/renderer/plugin_channel_host.cc b/content/renderer/plugin_channel_host.cc
index ba2e81c..53cfea1 100644
--- a/content/renderer/plugin_channel_host.cc
+++ b/content/renderer/plugin_channel_host.cc
@@ -6,9 +6,9 @@
 
 #include "base/metrics/histogram.h"
 #include "base/time.h"
+#include "content/child/child_process.h"
 #include "content/child/npobject_base.h"
 #include "content/child/plugin_messages.h"
-#include "content/common/child_process.h"
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
diff --git a/content/renderer/render_process.h b/content/renderer/render_process.h
index 8443131..0b1c058 100644
--- a/content/renderer/render_process.h
+++ b/content/renderer/render_process.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_RENDERER_RENDER_PROCESS_H_
 #define CONTENT_RENDERER_RENDER_PROCESS_H_
 
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
 #include "skia/ext/platform_canvas.h"
 
 class TransportDIB;
diff --git a/content/renderer/render_process_impl.cc b/content/renderer/render_process_impl.cc
index 1edc623..2458bf4 100644
--- a/content/renderer/render_process_impl.cc
+++ b/content/renderer/render_process_impl.cc
@@ -18,7 +18,7 @@
 #include "base/message_loop.h"
 #include "base/sys_info.h"
 #include "base/utf_string_conversions.h"
-#include "content/common/child_thread.h"
+#include "content/child/child_thread.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/renderer/content_renderer_client.h"
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index b880808..4748d17 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -25,13 +25,14 @@
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
+#include "content/child/child_histogram_message_filter.h"
 #include "content/child/indexed_db/indexed_db_dispatcher.h"
 #include "content/child/indexed_db/indexed_db_message_filter.h"
 #include "content/child/npobject_util.h"
 #include "content/child/plugin_messages.h"
+#include "content/child/resource_dispatcher.h"
 #include "content/child/web_database_observer_impl.h"
 #include "content/common/appcache/appcache_dispatcher.h"
-#include "content/common/child_histogram_message_filter.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/database_messages.h"
 #include "content/common/db_message_filter.h"
@@ -39,7 +40,6 @@
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/gpu_messages.h"
-#include "content/common/resource_dispatcher.h"
 #include "content/common/resource_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_constants.h"
diff --git a/content/renderer/render_thread_impl.h b/content/renderer/render_thread_impl.h
index 127c687..cf48425 100644
--- a/content/renderer/render_thread_impl.h
+++ b/content/renderer/render_thread_impl.h
@@ -13,8 +13,8 @@
 #include "base/string16.h"
 #include "base/timer.h"
 #include "build/build_config.h"
-#include "content/common/child_process.h"
-#include "content/common/child_thread.h"
+#include "content/child/child_process.h"
+#include "content/child/child_thread.h"
 #include "content/common/content_export.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 6851b4e..c619a97 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -28,24 +28,24 @@
 #include "base/strings/sys_string_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
+#include "content/child/child_thread.h"
+#include "content/child/fileapi/file_system_dispatcher.h"
 #include "content/child/fileapi/webfilesystem_callback_adapters.h"
+#include "content/child/quota_dispatcher.h"
+#include "content/child/webmessageportchannel_impl.h"
 #include "content/common/appcache/appcache_dispatcher.h"
-#include "content/common/child_thread.h"
 #include "content/common/clipboard_messages.h"
 #include "content/common/database_messages.h"
 #include "content/common/drag_messages.h"
-#include "content/common/fileapi/file_system_dispatcher.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/common/input_messages.h"
 #include "content/common/java_bridge_messages.h"
 #include "content/common/pepper_messages.h"
 #include "content/common/pepper_plugin_registry.h"
-#include "content/common/quota_dispatcher.h"
 #include "content/common/request_extra_data.h"
 #include "content/common/socket_stream_handle_data.h"
 #include "content/common/ssl_status_serialization.h"
 #include "content/common/view_messages.h"
-#include "content/common/webmessageportchannel_impl.h"
 #include "content/public/common/bindings_policy.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_constants.h"
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index cc8e584..2dd9caf 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -22,6 +22,7 @@
 #include "base/string_util.h"
 #include "base/threading/platform_thread.h"
 #include "base/time.h"
+#include "content/child/child_process.h"
 #include "content/common/pepper_plugin_registry.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index 855a2fd..cd622f8 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -12,18 +12,18 @@
 #include "base/shared_memory.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
+#include "content/child/database_util.h"
 #include "content/child/fileapi/webfilesystem_impl.h"
 #include "content/child/indexed_db/proxy_webidbfactory_impl.h"
 #include "content/child/npobject_util.h"
+#include "content/child/thread_safe_sender.h"
 #include "content/child/webblobregistry_impl.h"
-#include "content/common/database_util.h"
+#include "content/child/webmessageportchannel_impl.h"
 #include "content/common/file_utilities_messages.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "content/common/mime_registry_messages.h"
-#include "content/common/thread_safe_sender.h"
 #include "content/common/view_messages.h"
-#include "content/common/webmessageportchannel_impl.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.h b/content/renderer/renderer_webkitplatformsupport_impl.h
index b4a1723..a3005ad 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.h
+++ b/content/renderer/renderer_webkitplatformsupport_impl.h
@@ -8,11 +8,11 @@
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/platform_file.h"
+#include "content/child/webkitplatformsupport_impl.h"
 #include "content/common/content_export.h"
-#include "content/common/webkitplatformsupport_impl.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorkerRepository.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "third_party/WebKit/public/platform/WebIDBFactory.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorkerRepository.h"
 #include "webkit/renderer/compositor_bindings/web_compositor_support_impl.h"
 
 namespace cc {
diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc
index 09c298b..4bfff02 100644
--- a/content/renderer/webplugin_delegate_proxy.cc
+++ b/content/renderer/webplugin_delegate_proxy.cc
@@ -24,11 +24,11 @@
 #include "base/strings/string_split.h"
 #include "base/utf_string_conversions.h"
 #include "base/version.h"
+#include "content/child/child_process.h"
 #include "content/child/npobject_proxy.h"
 #include "content/child/npobject_stub.h"
 #include "content/child/npobject_util.h"
 #include "content/child/plugin_messages.h"
-#include "content/common/child_process.h"
 #include "content/common/view_messages.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/plugin_channel_host.h"
diff --git a/content/renderer/websharedworker_proxy.cc b/content/renderer/websharedworker_proxy.cc
index c049ac5..ffb57a6 100644
--- a/content/renderer/websharedworker_proxy.cc
+++ b/content/renderer/websharedworker_proxy.cc
@@ -3,9 +3,10 @@
 // found in the LICENSE file.
 
 #include "content/renderer/websharedworker_proxy.h"
-#include "content/common/child_thread.h"
+
+#include "content/child/child_thread.h"
+#include "content/child/webmessageportchannel_impl.h"
 #include "content/common/view_messages.h"
-#include "content/common/webmessageportchannel_impl.h"
 #include "content/common/worker_messages.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorkerClient.h"
diff --git a/content/renderer/websharedworkerrepository_impl.cc b/content/renderer/websharedworkerrepository_impl.cc
index eb3fc93..d914cf7 100644
--- a/content/renderer/websharedworkerrepository_impl.cc
+++ b/content/renderer/websharedworkerrepository_impl.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.  Use of this
-// source code is governed by a BSD-style license that can be found in the
-// LICENSE file.
+// Copyright 2009 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
 
 #include "content/renderer/websharedworkerrepository_impl.h"
 
-#include "content/common/child_thread.h"
+#include "content/child/child_thread.h"
 #include "content/common/view_messages.h"
 #include "content/renderer/websharedworker_proxy.h"
 
diff --git a/content/utility/DEPS b/content/utility/DEPS
index 7a77d69..f7630c38 100644
--- a/content/utility/DEPS
+++ b/content/utility/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+content/child",
   "+content/public/utility",
   "+sandbox/win/src",
   "+webkit/glue",
diff --git a/content/utility/utility_main.cc b/content/utility/utility_main.cc
index 04f7714..ef4fd1e 100644
--- a/content/utility/utility_main.cc
+++ b/content/utility/utility_main.cc
@@ -7,7 +7,7 @@
 #include "base/message_loop.h"
 #include "base/power_monitor/power_monitor.h"
 #include "base/threading/platform_thread.h"
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
 #include "content/common/sandbox_linux.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/main_function_params.h"
diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc
index eed1704..c9b22ea 100644
--- a/content/utility/utility_thread_impl.cc
+++ b/content/utility/utility_thread_impl.cc
@@ -9,10 +9,10 @@
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_vector.h"
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
+#include "content/child/webkitplatformsupport_impl.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/utility_messages.h"
-#include "content/common/webkitplatformsupport_impl.h"
 #include "content/public/utility/content_utility_client.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "webkit/plugins/npapi/plugin_list.h"
diff --git a/content/utility/utility_thread_impl.h b/content/utility/utility_thread_impl.h
index 31c51a1..5963370 100644
--- a/content/utility/utility_thread_impl.h
+++ b/content/utility/utility_thread_impl.h
@@ -10,7 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "content/common/child_thread.h"
+#include "content/child/child_thread.h"
 #include "content/common/content_export.h"
 #include "content/public/utility/utility_thread.h"
 
diff --git a/content/worker/websharedworker_stub.cc b/content/worker/websharedworker_stub.cc
index 8201ce8..5ee9c2f 100644
--- a/content/worker/websharedworker_stub.cc
+++ b/content/worker/websharedworker_stub.cc
@@ -5,16 +5,16 @@
 #include "content/worker/websharedworker_stub.h"
 
 #include "base/compiler_specific.h"
-#include "content/common/child_process.h"
-#include "content/common/child_thread.h"
-#include "content/common/fileapi/file_system_dispatcher.h"
-#include "content/common/webmessageportchannel_impl.h"
+#include "content/child/child_process.h"
+#include "content/child/child_thread.h"
+#include "content/child/fileapi/file_system_dispatcher.h"
+#include "content/child/webmessageportchannel_impl.h"
 #include "content/common/worker_messages.h"
 #include "content/worker/shared_worker_devtools_agent.h"
 #include "content/worker/worker_thread.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorker.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURL.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorker.h"
 
 namespace content {
 
diff --git a/content/worker/websharedworkerclient_proxy.cc b/content/worker/websharedworkerclient_proxy.cc
index 201b76f..788b091 100644
--- a/content/worker/websharedworkerclient_proxy.cc
+++ b/content/worker/websharedworkerclient_proxy.cc
@@ -7,10 +7,10 @@
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop.h"
+#include "content/child/fileapi/file_system_dispatcher.h"
 #include "content/child/fileapi/webfilesystem_callback_adapters.h"
-#include "content/common/fileapi/file_system_dispatcher.h"
-#include "content/common/quota_dispatcher.h"
-#include "content/common/webmessageportchannel_impl.h"
+#include "content/child/quota_dispatcher.h"
+#include "content/child/webmessageportchannel_impl.h"
 #include "content/common/worker_messages.h"
 #include "content/public/common/content_switches.h"
 #include "content/worker/shared_worker_devtools_agent.h"
diff --git a/content/worker/worker_main.cc b/content/worker/worker_main.cc
index 459e907..3527dd1 100644
--- a/content/worker/worker_main.cc
+++ b/content/worker/worker_main.cc
@@ -9,7 +9,7 @@
 #include "base/power_monitor/power_monitor.h"
 #include "base/string_util.h"
 #include "base/threading/platform_thread.h"
-#include "content/common/child_process.h"
+#include "content/child/child_process.h"
 #include "content/common/sandbox_linux.h"
 #include "content/public/common/main_function_params.h"
 #include "content/public/common/sandbox_init.h"
diff --git a/content/worker/worker_thread.h b/content/worker/worker_thread.h
index bc51f49..fe1379b 100644
--- a/content/worker/worker_thread.h
+++ b/content/worker/worker_thread.h
@@ -7,7 +7,7 @@
 
 #include <set>
 
-#include "content/common/child_thread.h"
+#include "content/child/child_thread.h"
 
 struct WorkerProcessMsg_CreateWorker_Params;
 
diff --git a/content/worker/worker_webkitplatformsupport_impl.cc b/content/worker/worker_webkitplatformsupport_impl.cc
index 7bcfcac..3539315 100644
--- a/content/worker/worker_webkitplatformsupport_impl.cc
+++ b/content/worker/worker_webkitplatformsupport_impl.cc
@@ -7,14 +7,14 @@
 #include "base/logging.h"
 #include "base/platform_file.h"
 #include "base/utf_string_conversions.h"
+#include "content/child/database_util.h"
 #include "content/child/fileapi/webfilesystem_impl.h"
 #include "content/child/indexed_db/proxy_webidbfactory_impl.h"
+#include "content/child/thread_safe_sender.h"
 #include "content/child/webblobregistry_impl.h"
-#include "content/common/database_util.h"
+#include "content/child/webmessageportchannel_impl.h"
 #include "content/common/file_utilities_messages.h"
 #include "content/common/mime_registry_messages.h"
-#include "content/common/thread_safe_sender.h"
-#include "content/common/webmessageportchannel_impl.h"
 #include "content/worker/worker_thread.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "net/base/mime_util.h"
diff --git a/content/worker/worker_webkitplatformsupport_impl.h b/content/worker/worker_webkitplatformsupport_impl.h
index 139faaf..4ad97f0 100644
--- a/content/worker/worker_webkitplatformsupport_impl.h
+++ b/content/worker/worker_webkitplatformsupport_impl.h
@@ -6,7 +6,7 @@
 #define CONTENT_WORKER_WORKER_WEBKITPLATFORMSUPPORT_IMPL_H_
 
 #include "base/memory/scoped_ptr.h"
-#include "content/common/webkitplatformsupport_impl.h"
+#include "content/child/webkitplatformsupport_impl.h"
 #include "third_party/WebKit/public/platform/WebIDBFactory.h"
 #include "third_party/WebKit/public/platform/WebMimeRegistry.h"