Move ChildThread and ChildProcess to content. Also move remaining code that they depend on and which depends on them.TBR=avi

Review URL: http://codereview.chromium.org/6628071

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

67 files changed, 133 insertions, 131 deletions

diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc
index e3f7fff..070dfb9 100644
--- a/chrome/browser/browser_main.cc
+++ b/chrome/browser/browser_main.cc
@@ -73,7 +73,6 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_init.h"
 #include "chrome/browser/ui/webui/chrome_url_data_manager_backend.h"
-#include "chrome/common/child_process.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ -92,6 +91,7 @@
 #include "content/browser/browser_thread.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
+#include "content/common/child_process.h"
 #include "grit/app_locale_settings.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
diff --git a/chrome/browser/importer/importer_bridge.cc b/chrome/browser/importer/importer_bridge.cc
index bd6ccd9..e1ddf2a1 100644
--- a/chrome/browser/importer/importer_bridge.cc
+++ b/chrome/browser/importer/importer_bridge.cc
@@ -14,10 +14,10 @@
 #if defined(OS_WIN)
 #include "chrome/browser/password_manager/ie7_password.h"
 #endif
-#include "chrome/common/child_thread.h"
 #include "chrome/browser/importer/importer_messages.h"
 #include "chrome/profile_import/profile_import_thread.h"
 #include "content/browser/browser_thread.h"
+#include "content/common/child_thread.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "webkit/glue/password_form.h"
 
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index df4ca6c..d2e6f9d 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -32,16 +32,12 @@
           'common/autofill_messages.cc',
           'common/autofill_messages.h',
           'common/bindings_policy.h',
-          'common/child_process.cc',
-          'common/child_process.h',
           'common/child_process_info.cc',
           'common/child_process_info.h',
           'common/child_process_logging.h',
           'common/child_process_logging_linux.cc',
           'common/child_process_logging_mac.mm',
           'common/child_process_logging_win.cc',
-          'common/child_thread.cc',
-          'common/child_thread.h',
           'common/chrome_application_mac.h',
           'common/chrome_application_mac.mm',
           'common/chrome_counters.cc',
@@ -68,12 +64,6 @@
           'common/dom_storage_messages.h',
           'common/dx_diag_node.cc',
           'common/dx_diag_node.h',
-          'common/file_system/webfilesystem_callback_dispatcher.cc',
-          'common/file_system/webfilesystem_callback_dispatcher.h',
-          'common/file_system/webfilesystem_impl.cc',
-          'common/file_system/webfilesystem_impl.h',
-          'common/file_system/webfilewriter_impl.cc',
-          'common/file_system/webfilewriter_impl.h',
           'common/file_utilities_messages.h',
           'common/font_descriptor_mac.h',
           'common/font_descriptor_mac.mm',
@@ -286,8 +276,6 @@
         'common/extensions/url_pattern.h',
         'common/extensions/user_script.cc',
         'common/extensions/user_script.h',
-        'common/file_system/file_system_dispatcher.cc',
-        'common/file_system/file_system_dispatcher.h',
         'common/font_loader_mac.h',
         'common/font_loader_mac.mm',
         'common/gears_api.h',
@@ -343,8 +331,6 @@
         'common/service_process_util_posix.cc',
         'common/service_process_util_posix.h',
         'common/service_process_util_win.cc',
-        'common/socket_stream_dispatcher.cc',
-        'common/socket_stream_dispatcher.h',
         'common/speech_input_result.h',
         'common/spellcheck_common.cc',
         'common/spellcheck_common.h',
@@ -600,13 +586,14 @@
           ],
           'sources': [
             '../webkit/glue/webkit_glue_dummy.cc',
-            'common/file_system/file_system_dispatcher_dummy.cc',
-            'common/socket_stream_dispatcher_dummy.cc',
             'common/url_constants.cc',
-            # TODO(jam): remove me once child_thread (which uses this) is moved
-            # out of chrome_common.
+            # TODO(bradnelson): once automatic generation of 64 bit targets on
+            # Windows is ready, take this out and add a dependency on
+            # content_common.gypi.
+            '../content/common/file_system/file_system_dispatcher_dummy.cc',
             '../content/common/message_router.cc',
             '../content/common/resource_dispatcher_dummy.cc',
+            '../content/common/socket_stream_dispatcher_dummy.cc',
           ],
           'export_dependent_settings': [
             '../app/app.gyp:app_base_nacl_win64',
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index d63df64..34b51e6 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -609,6 +609,8 @@
             # content_common.gypi and common.gypi in nacl_win64_dependencies
             # and get rid of the common_constants.gypi which was added as a hack
             # to avoid making common compile on 64 bit on Windows.
+            '../content/common/child_process.cc',
+            '../content/common/child_thread.cc',
             '../content/common/content_switches.cc',
             '../content/common/notification_details.cc',
             '../content/common/notification_service.cc',
diff --git a/chrome/common/database_util.cc b/chrome/common/database_util.cc
index 9e4a99d..2a985d3 100644
--- a/chrome/common/database_util.cc
+++ b/chrome/common/database_util.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/common/database_util.h"
 
-#include "chrome/common/child_thread.h"
 #include "chrome/common/database_messages.h"
+#include "content/common/child_thread.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "third_party/sqlite/sqlite3.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
diff --git a/chrome/common/webmessageportchannel_impl.cc b/chrome/common/webmessageportchannel_impl.cc
index 5326983..1fbed44 100644
--- a/chrome/common/webmessageportchannel_impl.cc
+++ b/chrome/common/webmessageportchannel_impl.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/common/webmessageportchannel_impl.h"
 
-#include "chrome/common/child_process.h"
-#include "chrome/common/child_thread.h"
 #include "chrome/common/worker_messages.h"
+#include "content/common/child_process.h"
+#include "content/common/child_thread.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMessagePortChannelClient.h"
 
diff --git a/chrome/gpu/gpu_channel.cc b/chrome/gpu/gpu_channel.cc
index dbbb9a5..bb71e62 100644
--- a/chrome/gpu/gpu_channel.cc
+++ b/chrome/gpu/gpu_channel.cc
@@ -11,12 +11,12 @@
 #include "base/command_line.h"
 #include "base/process_util.h"
 #include "base/string_util.h"
-#include "chrome/common/child_process.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/gpu_messages.h"
 #include "chrome/gpu/gpu_thread.h"
 #include "chrome/gpu/gpu_video_service.h"
+#include "content/common/child_process.h"
 
 #if defined(OS_POSIX)
 #include "ipc/ipc_channel_posix.h"
diff --git a/chrome/gpu/gpu_command_buffer_stub.cc b/chrome/gpu/gpu_command_buffer_stub.cc
index 0bf5427..bd925c0 100644
--- a/chrome/gpu/gpu_command_buffer_stub.cc
+++ b/chrome/gpu/gpu_command_buffer_stub.cc
@@ -7,11 +7,11 @@
 #include "base/process_util.h"
 #include "base/shared_memory.h"
 #include "build/build_config.h"
-#include "chrome/common/child_thread.h"
 #include "chrome/common/gpu_messages.h"
 #include "chrome/gpu/gpu_channel.h"
 #include "chrome/gpu/gpu_command_buffer_stub.h"
 #include "chrome/gpu/gpu_thread.h"
+#include "content/common/child_thread.h"
 
 using gpu::Buffer;
 
diff --git a/chrome/gpu/gpu_process.h b/chrome/gpu/gpu_process.h
index 32944d5..7a8caba 100644
--- a/chrome/gpu/gpu_process.h
+++ b/chrome/gpu/gpu_process.h
@@ -6,7 +6,7 @@
 #define CHROME_GPU_GPU_PROCESS_H_
 #pragma once
 
-#include "chrome/common/child_process.h"
+#include "content/common/child_process.h"
 
 class GpuProcess : public ChildProcess {
  public:
diff --git a/chrome/gpu/gpu_thread.cc b/chrome/gpu/gpu_thread.cc
index 80dd643..7415645 100644
--- a/chrome/gpu/gpu_thread.cc
+++ b/chrome/gpu/gpu_thread.cc
@@ -13,12 +13,12 @@
 #include "base/command_line.h"
 #include "base/threading/worker_pool.h"
 #include "build/build_config.h"
-#include "chrome/common/child_process.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/gpu_messages.h"
 #include "chrome/gpu/gpu_info_collector.h"
 #include "chrome/gpu/gpu_watchdog_thread.h"
+#include "content/common/child_process.h"
 #include "ipc/ipc_channel_handle.h"
 
 #if defined(OS_MACOSX)
diff --git a/chrome/gpu/gpu_thread.h b/chrome/gpu/gpu_thread.h
index 48727d5..a4920f8 100644
--- a/chrome/gpu/gpu_thread.h
+++ b/chrome/gpu/gpu_thread.h
@@ -13,11 +13,11 @@
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "build/build_config.h"
-#include "chrome/common/child_thread.h"
 #include "chrome/common/gpu_info.h"
 #include "chrome/gpu/gpu_channel.h"
 #include "chrome/gpu/gpu_config.h"
 #include "chrome/gpu/x_util.h"
+#include "content/common/child_thread.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace IPC {
diff --git a/chrome/gpu/gpu_video_decoder.cc b/chrome/gpu/gpu_video_decoder.cc
index c1210d4..cfc658b 100644
--- a/chrome/gpu/gpu_video_decoder.cc
+++ b/chrome/gpu/gpu_video_decoder.cc
@@ -5,11 +5,11 @@
 #include "chrome/gpu/gpu_video_decoder.h"
 
 #include "base/command_line.h"
-#include "chrome/common/child_thread.h"
 #include "chrome/common/gpu_messages.h"
 #include "chrome/gpu/gpu_channel.h"
 #include "chrome/gpu/media/fake_gl_video_decode_engine.h"
 #include "chrome/gpu/media/fake_gl_video_device.h"
+#include "content/common/child_thread.h"
 #include "media/base/data_buffer.h"
 #include "media/base/media_switches.h"
 #include "media/base/video_frame.h"
diff --git a/chrome/nacl/broker_thread.cc b/chrome/nacl/broker_thread.cc
index 984acb3..d069a13 100644
--- a/chrome/nacl/broker_thread.cc
+++ b/chrome/nacl/broker_thread.cc
@@ -8,11 +8,11 @@
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
-#include "chrome/common/child_process.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/nacl_cmd_line.h"
 #include "chrome/common/nacl_messages.h"
 #include "chrome/common/sandbox_policy.h"
+#include "content/common/child_process.h"
 #include "ipc/ipc_switches.h"
 
 NaClBrokerThread::NaClBrokerThread()
diff --git a/chrome/nacl/broker_thread.h b/chrome/nacl/broker_thread.h
index 8b2d7c5..3c1e3ac 100644
--- a/chrome/nacl/broker_thread.h
+++ b/chrome/nacl/broker_thread.h
@@ -7,8 +7,8 @@
 #pragma once
 
 #include "base/process.h"
-#include "chrome/common/child_thread.h"
 #include "chrome/common/nacl_types.h"
+#include "content/common/child_thread.h"
 
 #if defined(OS_WIN)
 #include "sandbox/src/sandbox.h"
diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc
index cb7fe26..c4ebd89 100644
--- a/chrome/nacl/nacl_main.cc
+++ b/chrome/nacl/nacl_main.cc
@@ -16,7 +16,6 @@
 #include "chrome/app/breakpad_linux.h"
 #endif
 
-#include "chrome/common/child_process.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/hi_res_timer_manager.h"
@@ -26,6 +25,7 @@
 #include "chrome/common/sandbox_policy.h"
 #include "chrome/nacl/nacl_main_platform_delegate.h"
 #include "chrome/nacl/nacl_thread.h"
+#include "content/common/child_process.h"
 #include "ui/base/system_monitor/system_monitor.h"
 
 #if defined(OS_WIN)
diff --git a/chrome/nacl/nacl_thread.h b/chrome/nacl/nacl_thread.h
index b330794..bf9645a 100644
--- a/chrome/nacl/nacl_thread.h
+++ b/chrome/nacl/nacl_thread.h
@@ -7,8 +7,8 @@
 #pragma once
 
 #include "base/native_library.h"
-#include "chrome/common/child_thread.h"
 #include "chrome/common/nacl_types.h"
+#include "content/common/child_thread.h"
 
 // The NaClThread class represents a background thread where NaCl app gets
 // started.
diff --git a/chrome/plugin/chrome_plugin_host.cc b/chrome/plugin/chrome_plugin_host.cc
index c0a7582..f402f16e 100644
--- a/chrome/plugin/chrome_plugin_host.cc
+++ b/chrome/plugin/chrome_plugin_host.cc
@@ -11,7 +11,6 @@
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/string_split.h"
-#include "chrome/common/child_process.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/chrome_plugin_util.h"
@@ -19,6 +18,7 @@
 #include "chrome/common/plugin_messages.h"
 #include "chrome/plugin/plugin_thread.h"
 #include "chrome/plugin/webplugin_proxy.h"
+#include "content/common/child_process.h"
 #include "content/common/resource_dispatcher.h"
 #include "net/base/data_url.h"
 #include "net/base/io_buffer.h"
diff --git a/chrome/plugin/plugin_channel.cc b/chrome/plugin/plugin_channel.cc
index ff817a7..565060b 100644
--- a/chrome/plugin/plugin_channel.cc
+++ b/chrome/plugin/plugin_channel.cc
@@ -10,12 +10,12 @@
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "build/build_config.h"
-#include "chrome/common/child_process.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/plugin/plugin_thread.h"
 #include "chrome/plugin/webplugin_delegate_stub.h"
 #include "chrome/plugin/webplugin_proxy.h"
+#include "content/common/child_process.h"
 #include "webkit/plugins/npapi/plugin_instance.h"
 
 #if defined(OS_POSIX)
diff --git a/chrome/plugin/plugin_channel_base.cc b/chrome/plugin/plugin_channel_base.cc
index 3c43124..df09e39 100644
--- a/chrome/plugin/plugin_channel_base.cc
+++ b/chrome/plugin/plugin_channel_base.cc
@@ -10,7 +10,7 @@
 #include "base/hash_tables.h"
 #include "base/lazy_instance.h"
 #include "base/string_number_conversions.h"
-#include "chrome/common/child_process.h"
+#include "content/common/child_process.h"
 #include "ipc/ipc_sync_message.h"
 
 #if defined(OS_POSIX)
diff --git a/chrome/plugin/plugin_main.cc b/chrome/plugin/plugin_main.cc
index d8264fe..2175b05 100644
--- a/chrome/plugin/plugin_main.cc
+++ b/chrome/plugin/plugin_main.cc
@@ -13,7 +13,6 @@
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/threading/platform_thread.h"
-#include "chrome/common/child_process.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/default_plugin.h"
@@ -21,6 +20,7 @@
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/main_function_params.h"
 #include "chrome/plugin/plugin_thread.h"
+#include "content/common/child_process.h"
 #include "ui/base/system_monitor/system_monitor.h"
 
 #if defined(OS_WIN)
diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc
index 491feb0..ad0f521 100644
--- a/chrome/plugin/plugin_thread.cc
+++ b/chrome/plugin/plugin_thread.cc
@@ -19,7 +19,6 @@
 #include "base/lazy_instance.h"
 #include "base/process_util.h"
 #include "base/threading/thread_local.h"
-#include "chrome/common/child_process.h"
 #include "chrome/common/chrome_plugin_lib.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/plugin_messages.h"
@@ -27,6 +26,7 @@
 #include "chrome/plugin/chrome_plugin_host.h"
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/renderer/render_thread.h"
+#include "content/common/child_process.h"
 #include "ipc/ipc_channel_handle.h"
 #include "net/base/net_errors.h"
 #include "webkit/glue/webkit_glue.h"
diff --git a/chrome/plugin/plugin_thread.h b/chrome/plugin/plugin_thread.h
index f5ef267..8514589 100644
--- a/chrome/plugin/plugin_thread.h
+++ b/chrome/plugin/plugin_thread.h
@@ -9,8 +9,8 @@
 #include "base/file_path.h"
 #include "base/native_library.h"
 #include "build/build_config.h"
-#include "chrome/common/child_thread.h"
 #include "chrome/plugin/plugin_channel.h"
+#include "content/common/child_thread.h"
 #include "webkit/plugins/npapi/plugin_lib.h"
 
 #if defined(OS_POSIX)
diff --git a/chrome/ppapi_plugin/plugin_process_dispatcher.cc b/chrome/ppapi_plugin/plugin_process_dispatcher.cc
index 833a20e..3f66905 100644
--- a/chrome/ppapi_plugin/plugin_process_dispatcher.cc
+++ b/chrome/ppapi_plugin/plugin_process_dispatcher.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/ppapi_plugin/plugin_process_dispatcher.h"
 
-#include "chrome/common/child_process.h"
+#include "content/common/child_process.h"
 
 namespace {
 
diff --git a/chrome/ppapi_plugin/ppapi_plugin_main.cc b/chrome/ppapi_plugin/ppapi_plugin_main.cc
index eb52a3f..5d57976 100644
--- a/chrome/ppapi_plugin/ppapi_plugin_main.cc
+++ b/chrome/ppapi_plugin/ppapi_plugin_main.cc
@@ -5,10 +5,10 @@
 #include "base/message_loop.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
-#include "chrome/common/child_process.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/main_function_params.h"
 #include "chrome/ppapi_plugin/ppapi_thread.h"
+#include "content/common/child_process.h"
 
 // Main function for starting the PPAPI plugin process.
 int PpapiPluginMain(const MainFunctionParams& parameters) {
diff --git a/chrome/ppapi_plugin/ppapi_process.h b/chrome/ppapi_plugin/ppapi_process.h
index 590f995..ff0472d 100644
--- a/chrome/ppapi_plugin/ppapi_process.h
+++ b/chrome/ppapi_plugin/ppapi_process.h
@@ -6,7 +6,7 @@
 #define CHROME_PPAPI_PLUGIN_PPAPI_PROCESS_H_
 #pragma once
 
-#include "chrome/common/child_process.h"
+#include "content/common/child_process.h"
 
 class PpapiProcess : public ChildProcess {
  public:
diff --git a/chrome/ppapi_plugin/ppapi_thread.cc b/chrome/ppapi_plugin/ppapi_thread.cc
index 0e1a030..98d0014 100644
--- a/chrome/ppapi_plugin/ppapi_thread.cc
+++ b/chrome/ppapi_plugin/ppapi_thread.cc
@@ -8,8 +8,8 @@
 
 #include "base/process_util.h"
 #include "base/rand_util.h"
-#include "chrome/common/child_process.h"
 #include "chrome/ppapi_plugin/plugin_process_dispatcher.h"
+#include "content/common/child_process.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ppapi/c/pp_errors.h"
diff --git a/chrome/ppapi_plugin/ppapi_thread.h b/chrome/ppapi_plugin/ppapi_thread.h
index 32e45f5..e4058ad 100644
--- a/chrome/ppapi_plugin/ppapi_thread.h
+++ b/chrome/ppapi_plugin/ppapi_thread.h
@@ -11,7 +11,7 @@
 #include "base/scoped_native_library.h"
 #include "base/scoped_ptr.h"
 #include "build/build_config.h"
-#include "chrome/common/child_thread.h"
+#include "content/common/child_thread.h"
 #include "ppapi/c/pp_module.h"
 #include "ppapi/proxy/dispatcher.h"
 
diff --git a/chrome/profile_import/profile_import_main.cc b/chrome/profile_import/profile_import_main.cc
index 73751e0..037ea22 100644
--- a/chrome/profile_import/profile_import_main.cc
+++ b/chrome/profile_import/profile_import_main.cc
@@ -6,11 +6,11 @@
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/threading/platform_thread.h"
-#include "chrome/common/child_process.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/main_function_params.h"
 #include "chrome/profile_import/profile_import_thread.h"
+#include "content/common/child_process.h"
 
 // Mainline routine for running as the profile import process.
 int ProfileImportMain(const MainFunctionParams& parameters) {
diff --git a/chrome/profile_import/profile_import_thread.cc b/chrome/profile_import/profile_import_thread.cc
index d012d13..2c44614 100644
--- a/chrome/profile_import/profile_import_thread.cc
+++ b/chrome/profile_import/profile_import_thread.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/importer/importer_list.h"
 #include "chrome/browser/importer/importer_messages.h"
 #include "chrome/browser/search_engines/template_url.h"
-#include "chrome/common/child_process.h"
+#include "content/common/child_process.h"
 
 namespace {
 // Rather than sending all import items over IPC at once we chunk them into
diff --git a/chrome/profile_import/profile_import_thread.h b/chrome/profile_import/profile_import_thread.h
index 3ddd7f4..3fd1fd8 100644
--- a/chrome/profile_import/profile_import_thread.h
+++ b/chrome/profile_import/profile_import_thread.h
@@ -15,7 +15,7 @@
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/importer/profile_writer.h"
-#include "chrome/common/child_thread.h"
+#include "content/common/child_thread.h"
 #include "webkit/glue/password_form.h"
 
 class DictionaryValue;
diff --git a/chrome/renderer/gpu_channel_host.cc b/chrome/renderer/gpu_channel_host.cc
index 4e6c075..705193d 100644
--- a/chrome/renderer/gpu_channel_host.cc
+++ b/chrome/renderer/gpu_channel_host.cc
@@ -4,12 +4,12 @@
 
 #include "chrome/renderer/gpu_channel_host.h"
 
-#include "chrome/common/child_process.h"
 #include "chrome/common/gpu_create_command_buffer_config.h"
 #include "chrome/common/gpu_messages.h"
 #include "chrome/renderer/command_buffer_proxy.h"
 #include "chrome/renderer/gpu_video_service_host.h"
 #include "chrome/renderer/render_thread.h"
+#include "content/common/child_process.h"
 
 GpuChannelHost::GpuChannelHost() : state_(kUnconnected) {
 }
diff --git a/chrome/renderer/media/ipc_video_decoder.cc b/chrome/renderer/media/ipc_video_decoder.cc
index 092442a..89c980d 100644
--- a/chrome/renderer/media/ipc_video_decoder.cc
+++ b/chrome/renderer/media/ipc_video_decoder.cc
@@ -5,8 +5,8 @@
 #include "chrome/renderer/media/ipc_video_decoder.h"
 
 #include "base/task.h"
-#include "chrome/common/child_process.h"
 #include "chrome/renderer/ggl/ggl.h"
+#include "content/common/child_process.h"
 #include "media/base/callback.h"
 #include "media/base/filters.h"
 #include "media/base/filter_host.h"
diff --git a/chrome/renderer/pepper_plugin_delegate_impl.cc b/chrome/renderer/pepper_plugin_delegate_impl.cc
index 469bac6..2fa07c2 100644
--- a/chrome/renderer/pepper_plugin_delegate_impl.cc
+++ b/chrome/renderer/pepper_plugin_delegate_impl.cc
@@ -14,8 +14,6 @@
 #include "base/string_split.h"
 #include "base/task.h"
 #include "base/time.h"
-#include "chrome/common/child_thread.h"
-#include "chrome/common/file_system/file_system_dispatcher.h"
 #include "chrome/common/pepper_file_messages.h"
 #include "chrome/common/pepper_messages.h"
 #include "chrome/common/pepper_plugin_registry.h"
@@ -30,6 +28,8 @@
 #include "chrome/renderer/render_view.h"
 #include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h"
 #include "chrome/renderer/webplugin_delegate_proxy.h"
+#include "content/common/child_thread.h"
+#include "content/common/file_system/file_system_dispatcher.h"
 #include "grit/locale_settings.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ppapi/c/dev/pp_video_dev.h"
diff --git a/chrome/renderer/render_process.h b/chrome/renderer/render_process.h
index 5835390..5cc7999 100644
--- a/chrome/renderer/render_process.h
+++ b/chrome/renderer/render_process.h
@@ -6,7 +6,7 @@
 #define CHROME_RENDERER_RENDER_PROCESS_H_
 #pragma once
 
-#include "chrome/common/child_process.h"
+#include "content/common/child_process.h"
 #include "skia/ext/platform_canvas.h"
 
 class TransportDIB;
diff --git a/chrome/renderer/render_thread.h b/chrome/renderer/render_thread.h
index 02a2fa1..db1deab 100644
--- a/chrome/renderer/render_thread.h
+++ b/chrome/renderer/render_thread.h
@@ -14,11 +14,11 @@
 #include "base/time.h"
 #include "base/timer.h"
 #include "build/build_config.h"
-#include "chrome/common/child_thread.h"
 #include "chrome/common/css_colors.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/gpu_info.h"
 #include "chrome/renderer/visitedlink_slave.h"
+#include "content/common/child_thread.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/ipc_platform_file.h"
 #include "ui/gfx/native_widget_types.h"
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 9f0057c..05bca8e 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -33,8 +33,6 @@
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_set.h"
-#include "chrome/common/file_system/file_system_dispatcher.h"
-#include "chrome/common/file_system/webfilesystem_callback_dispatcher.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/notification_service.h"
@@ -105,6 +103,8 @@
 #include "chrome/renderer/websharedworker_proxy.h"
 #include "chrome/renderer/webworker_proxy.h"
 #include "content/common/content_constants.h"
+#include "content/common/file_system/file_system_dispatcher.h"
+#include "content/common/file_system/webfilesystem_callback_dispatcher.h"
 #include "grit/generated_resources.h"
 #include "grit/renderer_resources.h"
 #include "media/base/filter_collection.h"
diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index 72ff0ad..2506066 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -19,12 +19,12 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/common/socket_stream_dispatcher.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/plugin/npobject_util.h"
 #include "chrome/renderer/net/renderer_net_predictor.h"
 #include "chrome/renderer/render_process.h"
 #include "chrome/renderer/render_thread.h"
+#include "content/common/socket_stream_dispatcher.h"
 #include "googleurl/src/url_util.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKitClient.h"
diff --git a/chrome/renderer/renderer_webkitclient_impl.cc b/chrome/renderer/renderer_webkitclient_impl.cc
index c16a553..e6c56e5 100644
--- a/chrome/renderer/renderer_webkitclient_impl.cc
+++ b/chrome/renderer/renderer_webkitclient_impl.cc
@@ -11,7 +11,6 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/database_util.h"
-#include "chrome/common/file_system/webfilesystem_impl.h"
 #include "chrome/common/file_utilities_messages.h"
 #include "chrome/common/mime_registry_messages.h"
 #include "chrome/common/render_messages.h"
@@ -27,6 +26,7 @@
 #include "chrome/renderer/visitedlink_slave.h"
 #include "chrome/renderer/webgraphicscontext3d_command_buffer_impl.h"
 #include "chrome/renderer/websharedworkerrepository_impl.h"
+#include "content/common/file_system/webfilesystem_impl.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobRegistry.h"
diff --git a/chrome/renderer/webworker_base.cc b/chrome/renderer/webworker_base.cc
index 056d55b..34efb07 100644
--- a/chrome/renderer/webworker_base.cc
+++ b/chrome/renderer/webworker_base.cc
@@ -4,11 +4,11 @@
 
 #include "chrome/renderer/webworker_base.h"
 
-#include "chrome/common/child_thread.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
 #include "chrome/common/webmessageportchannel_impl.h"
 #include "chrome/common/worker_messages.h"
+#include "content/common/child_thread.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWorkerClient.h"
 
diff --git a/chrome/renderer/webworker_proxy.cc b/chrome/renderer/webworker_proxy.cc
index 96715ff..551bf33 100644
--- a/chrome/renderer/webworker_proxy.cc
+++ b/chrome/renderer/webworker_proxy.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/renderer/webworker_proxy.h"
 
-#include "chrome/common/child_thread.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/webmessageportchannel_impl.h"
 #include "chrome/common/worker_messages.h"
+#include "content/common/child_thread.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWorkerClient.h"
 
diff --git a/chrome/utility/utility_main.cc b/chrome/utility/utility_main.cc
index 440f1ef..2a45459 100644
--- a/chrome/utility/utility_main.cc
+++ b/chrome/utility/utility_main.cc
@@ -9,7 +9,6 @@
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/threading/platform_thread.h"
-#include "chrome/common/child_process.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
@@ -17,6 +16,7 @@
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/main_function_params.h"
 #include "chrome/utility/utility_thread.h"
+#include "content/common/child_process.h"
 #include "ui/base/system_monitor/system_monitor.h"
 #include "ui/base/ui_base_switches.h"
 
diff --git a/chrome/utility/utility_thread.cc b/chrome/utility/utility_thread.cc
index 0556cbb..9257d38 100644
--- a/chrome/utility/utility_thread.cc
+++ b/chrome/utility/utility_thread.cc
@@ -10,7 +10,6 @@
 #include "base/path_service.h"
 #include "base/values.h"
 #include "build/build_config.h"
-#include "chrome/common/child_process.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_unpacker.h"
 #include "chrome/common/extensions/update_manifest.h"
@@ -18,6 +17,7 @@
 #include "chrome/common/serialized_script_value.h"
 #include "chrome/common/utility_messages.h"
 #include "chrome/common/web_resource/web_resource_unpacker.h"
+#include "content/common/child_process.h"
 #include "printing/page_range.h"
 #include "printing/units.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/utility/utility_thread.h b/chrome/utility/utility_thread.h
index 348cc90..e1e016e 100644
--- a/chrome/utility/utility_thread.h
+++ b/chrome/utility/utility_thread.h
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "base/platform_file.h"
-#include "chrome/common/child_thread.h"
+#include "content/common/child_thread.h"
 #include "printing/native_metafile.h"
 
 class GURL;
diff --git a/chrome/worker/websharedworker_stub.cc b/chrome/worker/websharedworker_stub.cc
index 2e4e1d7..4fb7b7b 100644
--- a/chrome/worker/websharedworker_stub.cc
+++ b/chrome/worker/websharedworker_stub.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/worker/websharedworker_stub.h"
 
-#include "chrome/common/child_thread.h"
-#include "chrome/common/file_system/file_system_dispatcher.h"
 #include "chrome/common/webmessageportchannel_impl.h"
 #include "chrome/common/worker_messages.h"
+#include "content/common/child_thread.h"
+#include "content/common/file_system/file_system_dispatcher.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorker.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
diff --git a/chrome/worker/webworker_stub.cc b/chrome/worker/webworker_stub.cc
index 45d5c3e..308e589 100644
--- a/chrome/worker/webworker_stub.cc
+++ b/chrome/worker/webworker_stub.cc
@@ -5,11 +5,11 @@
 #include "chrome/worker/webworker_stub.h"
 
 #include "base/command_line.h"
-#include "chrome/common/child_thread.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/file_system/file_system_dispatcher.h"
 #include "chrome/common/webmessageportchannel_impl.h"
 #include "chrome/common/worker_messages.h"
+#include "content/common/child_thread.h"
+#include "content/common/file_system/file_system_dispatcher.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebWorker.h"
diff --git a/chrome/worker/webworker_stub_base.cc b/chrome/worker/webworker_stub_base.cc
index db9ab79..93ad75d 100644
--- a/chrome/worker/webworker_stub_base.cc
+++ b/chrome/worker/webworker_stub_base.cc
@@ -5,8 +5,8 @@
 #include "chrome/worker/webworker_stub_base.h"
 
 #include "base/compiler_specific.h"
-#include "chrome/common/child_process.h"
 #include "chrome/worker/worker_thread.h"
+#include "content/common/child_process.h"
 
 WebWorkerStubBase::WebWorkerStubBase(
     int route_id, const WorkerAppCacheInitInfo& appcache_init_info)
diff --git a/chrome/worker/webworkerclient_proxy.cc b/chrome/worker/webworkerclient_proxy.cc
index 75bb276..390aaba 100644
--- a/chrome/worker/webworkerclient_proxy.cc
+++ b/chrome/worker/webworkerclient_proxy.cc
@@ -7,14 +7,14 @@
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/file_system/file_system_dispatcher.h"
-#include "chrome/common/file_system/webfilesystem_callback_dispatcher.h"
 #include "chrome/common/webmessageportchannel_impl.h"
 #include "chrome/common/worker_messages.h"
 #include "chrome/renderer/webworker_proxy.h"
 #include "chrome/worker/webworker_stub_base.h"
 #include "chrome/worker/worker_thread.h"
 #include "chrome/worker/worker_webapplicationcachehost_impl.h"
+#include "content/common/file_system/file_system_dispatcher.h"
+#include "content/common/file_system/webfilesystem_callback_dispatcher.h"
 #include "ipc/ipc_logging.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
diff --git a/chrome/worker/worker_main.cc b/chrome/worker/worker_main.cc
index c39a4b8..0207508 100644
--- a/chrome/worker/worker_main.cc
+++ b/chrome/worker/worker_main.cc
@@ -6,13 +6,13 @@
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/threading/platform_thread.h"
-#include "chrome/common/child_process.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/hi_res_timer_manager.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/main_function_params.h"
 #include "chrome/worker/worker_thread.h"
+#include "content/common/child_process.h"
 #include "ui/base/system_monitor/system_monitor.h"
 
 #if defined(OS_WIN)
diff --git a/chrome/worker/worker_thread.h b/chrome/worker/worker_thread.h
index 1bde9b5..efc7b16 100644
--- a/chrome/worker/worker_thread.h
+++ b/chrome/worker/worker_thread.h
@@ -8,7 +8,7 @@
 
 #include <set>
 
-#include "chrome/common/child_thread.h"
+#include "content/common/child_thread.h"
 
 class GURL;
 class AppCacheDispatcher;
diff --git a/chrome/worker/worker_webkitclient_impl.cc b/chrome/worker/worker_webkitclient_impl.cc
index 836e84d..a6e4407 100644
--- a/chrome/worker/worker_webkitclient_impl.cc
+++ b/chrome/worker/worker_webkitclient_impl.cc
@@ -7,7 +7,6 @@
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/database_util.h"
-#include "chrome/common/file_system/webfilesystem_impl.h"
 #include "chrome/common/file_utilities_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
@@ -15,6 +14,7 @@
 #include "chrome/common/webblobregistry_impl.h"
 #include "chrome/common/webmessageportchannel_impl.h"
 #include "chrome/worker/worker_thread.h"
+#include "content/common/file_system/webfilesystem_impl.h"
 #include "ipc/ipc_sync_message_filter.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobRegistry.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
diff --git a/chrome/common/child_process.cc b/content/common/child_process.cc
index e32bb1b..c5551bb 100644
--- a/chrome/common/child_process.cc
+++ b/content/common/child_process.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "chrome/common/child_process.h"
+#include "content/common/child_process.h"
 
 #if defined(OS_POSIX)
 #include <signal.h>  // For SigUSR1Handler below.
@@ -13,8 +13,7 @@
 #include "base/string_number_conversions.h"
 #include "base/threading/thread.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/common/child_thread.h"
-#include "grit/chromium_strings.h"
+#include "content/common/child_thread.h"
 
 #if defined(OS_POSIX)
 static void SigUSR1Handler(int signal) { }
diff --git a/chrome/common/child_process.h b/content/common/child_process.h
index c656317..e8fbd00 100644
--- a/chrome/common/child_process.h
+++ b/content/common/child_process.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 CHROME_COMMON_CHILD_PROCESS_H__
-#define CHROME_COMMON_CHILD_PROCESS_H__
+#ifndef CONTENT_COMMON_CHILD_PROCESS_H_
+#define CONTENT_COMMON_CHILD_PROCESS_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -69,4 +69,4 @@ class ChildProcess {
   DISALLOW_COPY_AND_ASSIGN(ChildProcess);
 };
 
-#endif  // CHROME_COMMON_CHILD_PROCESS_H__
+#endif  // CONTENT_COMMON_CHILD_PROCESS_H_
diff --git a/chrome/common/child_thread.cc b/content/common/child_thread.cc
index ac5bec4..f2410e2 100644
--- a/chrome/common/child_thread.cc
+++ b/content/common/child_thread.cc
@@ -1,19 +1,19 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "chrome/common/child_thread.h"
+#include "content/common/child_thread.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/command_line.h"
-#include "chrome/common/child_process.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/common/file_system/file_system_dispatcher.h"
-#include "chrome/common/socket_stream_dispatcher.h"
+#include "content/common/child_process.h"
 #include "content/common/child_process_messages.h"
+#include "content/common/content_switches.h"
+#include "content/common/file_system/file_system_dispatcher.h"
 #include "content/common/notification_service.h"
 #include "content/common/resource_dispatcher.h"
+#include "content/common/socket_stream_dispatcher.h"
 #include "ipc/ipc_logging.h"
 #include "ipc/ipc_sync_channel.h"
 #include "ipc/ipc_sync_message_filter.h"
diff --git a/chrome/common/child_thread.h b/content/common/child_thread.h
index 9ef202e..b4b07d3 100644
--- a/chrome/common/child_thread.h
+++ b/content/common/child_thread.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
-#ifndef CHROME_COMMON_CHILD_THREAD_H_
-#define CHROME_COMMON_CHILD_THREAD_H_
+#ifndef CONTENT_COMMON_CHILD_THREAD_H_
+#define CONTENT_COMMON_CHILD_THREAD_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -127,4 +127,4 @@ class ChildThread : public IPC::Channel::Listener,
   DISALLOW_COPY_AND_ASSIGN(ChildThread);
 };
 
-#endif  // CHROME_COMMON_CHILD_THREAD_H_
+#endif  // CONTENT_COMMON_CHILD_THREAD_H_
diff --git a/chrome/common/file_system/file_system_dispatcher.cc b/content/common/file_system/file_system_dispatcher.cc
index de8814b..c614300 100644
--- a/chrome/common/file_system/file_system_dispatcher.cc
+++ b/content/common/file_system/file_system_dispatcher.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "chrome/common/file_system/file_system_dispatcher.h"
+#include "content/common/file_system/file_system_dispatcher.h"
 
 #include "base/file_util.h"
-#include "chrome/common/child_thread.h"
+#include "content/common/child_thread.h"
 #include "content/common/file_system_messages.h"
 
 FileSystemDispatcher::FileSystemDispatcher() {
diff --git a/chrome/common/file_system/file_system_dispatcher.h b/content/common/file_system/file_system_dispatcher.h
index 65e1a6d..6481cbc 100644
--- a/chrome/common/file_system/file_system_dispatcher.h
+++ b/content/common/file_system/file_system_dispatcher.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
-#ifndef CHROME_COMMON_FILE_SYSTEM_FILE_SYSTEM_DISPATCHER_H_
-#define CHROME_COMMON_FILE_SYSTEM_FILE_SYSTEM_DISPATCHER_H_
+#ifndef CONTENT_COMMON_FILE_SYSTEM_FILE_SYSTEM_DISPATCHER_H_
+#define CONTENT_COMMON_FILE_SYSTEM_FILE_SYSTEM_DISPATCHER_H_
 
 #include <vector>
 
@@ -97,4 +97,4 @@ class FileSystemDispatcher : public IPC::Channel::Listener {
   DISALLOW_COPY_AND_ASSIGN(FileSystemDispatcher);
 };
 
-#endif  // CHROME_COMMON_FILE_SYSTEM_FILE_SYSTEM_DISPATCHER_H_
+#endif  // CONTENT_COMMON_FILE_SYSTEM_FILE_SYSTEM_DISPATCHER_H_
diff --git a/chrome/common/file_system/file_system_dispatcher_dummy.cc b/content/common/file_system/file_system_dispatcher_dummy.cc
index a7c8c71..c7f567f 100644
--- a/chrome/common/file_system/file_system_dispatcher_dummy.cc
+++ b/content/common/file_system/file_system_dispatcher_dummy.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "chrome/common/file_system/file_system_dispatcher.h"
+#include "content/common/file_system/file_system_dispatcher.h"
 
 #include "base/compiler_specific.h"
 
diff --git a/chrome/common/file_system/webfilesystem_callback_dispatcher.cc b/content/common/file_system/webfilesystem_callback_dispatcher.cc
index f549ade..16262f4 100644
--- a/chrome/common/file_system/webfilesystem_callback_dispatcher.cc
+++ b/content/common/file_system/webfilesystem_callback_dispatcher.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "chrome/common/file_system/webfilesystem_callback_dispatcher.h"
+#include "content/common/file_system/webfilesystem_callback_dispatcher.h"
 
 #include <string>
 #include <vector>
diff --git a/chrome/common/file_system/webfilesystem_callback_dispatcher.h b/content/common/file_system/webfilesystem_callback_dispatcher.h
index dc570fa..4699c69 100644
--- a/chrome/common/file_system/webfilesystem_callback_dispatcher.h
+++ b/content/common/file_system/webfilesystem_callback_dispatcher.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
-#ifndef CHROME_COMMON_FILE_SYSTEM_WEBFILESYSTEM_CALLBACK_DISPATCHER_H_
-#define CHROME_COMMON_FILE_SYSTEM_WEBFILESYSTEM_CALLBACK_DISPATCHER_H_
+#ifndef CONTENT_COMMON_FILE_SYSTEM_WEBFILESYSTEM_CALLBACK_DISPATCHER_H_
+#define CONTENT_COMMON_FILE_SYSTEM_WEBFILESYSTEM_CALLBACK_DISPATCHER_H_
 
 #include "base/basictypes.h"
 #include "base/platform_file.h"
@@ -34,4 +34,4 @@ class WebFileSystemCallbackDispatcher
   WebKit::WebFileSystemCallbacks* callbacks_;
 };
 
-#endif  // CHROME_COMMON_FILE_SYSTEM_WEBFILESYSTEM_CALLBACK_DISPATCHER_H_
+#endif  // CONTENT_COMMON_FILE_SYSTEM_WEBFILESYSTEM_CALLBACK_DISPATCHER_H_
diff --git a/chrome/common/file_system/webfilesystem_impl.cc b/content/common/file_system/webfilesystem_impl.cc
index 9f5a0eaa..43b78f3 100644
--- a/chrome/common/file_system/webfilesystem_impl.cc
+++ b/content/common/file_system/webfilesystem_impl.cc
@@ -1,13 +1,13 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "chrome/common/file_system/webfilesystem_impl.h"
+#include "content/common/file_system/webfilesystem_impl.h"
 
-#include "chrome/common/file_system/file_system_dispatcher.h"
-#include "chrome/common/file_system/webfilesystem_callback_dispatcher.h"
-#include "chrome/common/file_system/webfilewriter_impl.h"
-#include "chrome/common/child_thread.h"
+#include "content/common/child_thread.h"
+#include "content/common/file_system/file_system_dispatcher.h"
+#include "content/common/file_system/webfilesystem_callback_dispatcher.h"
+#include "content/common/file_system/webfilewriter_impl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileInfo.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
diff --git a/chrome/common/file_system/webfilesystem_impl.h b/content/common/file_system/webfilesystem_impl.h
index 9aad3f5..1d8b002 100644
--- a/chrome/common/file_system/webfilesystem_impl.h
+++ b/content/common/file_system/webfilesystem_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
-#ifndef CHROME_COMMON_FILE_SYSTEM_WEBFILESYSTEM_IMPL_H_
-#define CHROME_COMMON_FILE_SYSTEM_WEBFILESYSTEM_IMPL_H_
+#ifndef CONTENT_COMMON_FILE_SYSTEM_WEBFILESYSTEM_IMPL_H_
+#define CONTENT_COMMON_FILE_SYSTEM_WEBFILESYSTEM_IMPL_H_
 
 #include "base/basictypes.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystem.h"
@@ -66,4 +66,4 @@ class WebFileSystemImpl : public WebKit::WebFileSystem {
       const WebKit::WebString& path, WebKit::WebFileWriterClient*);
 };
 
-#endif  // CHROME_COMMON_FILE_SYSTEM_WEBFILESYSTEM_IMPL_H_
+#endif  // CONTENT_COMMON_FILE_SYSTEM_WEBFILESYSTEM_IMPL_H_
diff --git a/chrome/common/file_system/webfilewriter_impl.cc b/content/common/file_system/webfilewriter_impl.cc
index 7fc2656..45e9d5b 100644
--- a/chrome/common/file_system/webfilewriter_impl.cc
+++ b/content/common/file_system/webfilewriter_impl.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "chrome/common/file_system/webfilewriter_impl.h"
+#include "content/common/file_system/webfilewriter_impl.h"
 
-#include "chrome/common/child_thread.h"
-#include "chrome/common/file_system/file_system_dispatcher.h"
+#include "content/common/child_thread.h"
+#include "content/common/file_system/file_system_dispatcher.h"
 
 namespace {
 
diff --git a/chrome/common/file_system/webfilewriter_impl.h b/content/common/file_system/webfilewriter_impl.h
index 9c9edb5..2be2437 100644
--- a/chrome/common/file_system/webfilewriter_impl.h
+++ b/content/common/file_system/webfilewriter_impl.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
-#ifndef CHROME_COMMON_FILE_SYSTEM_WEBFILEWRITER_IMPL_H_
-#define CHROME_COMMON_FILE_SYSTEM_WEBFILEWRITER_IMPL_H_
+#ifndef CONTENT_COMMON_FILE_SYSTEM_WEBFILEWRITER_IMPL_H_
+#define CONTENT_COMMON_FILE_SYSTEM_WEBFILEWRITER_IMPL_H_
 
 #include "base/ref_counted.h"
 #include "base/weak_ptr.h"
@@ -31,4 +31,4 @@ class WebFileWriterImpl : public fileapi::WebFileWriterBase,
   int request_id_;
 };
 
-#endif  // CHROME_COMMON_FILE_SYSTEM_WEBFILEWRITER_IMPL_H_
+#endif  // CONTENT_COMMON_FILE_SYSTEM_WEBFILEWRITER_IMPL_H_
diff --git a/chrome/common/socket_stream_dispatcher.cc b/content/common/socket_stream_dispatcher.cc
index 362c19b..583b5f7 100644
--- a/chrome/common/socket_stream_dispatcher.cc
+++ b/content/common/socket_stream_dispatcher.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "chrome/common/socket_stream_dispatcher.h"
+#include "content/common/socket_stream_dispatcher.h"
 
 #include <vector>
 
@@ -10,7 +10,7 @@
 #include "base/message_loop.h"
 #include "base/ref_counted.h"
 #include "base/task.h"
-#include "chrome/common/child_thread.h"
+#include "content/common/child_thread.h"
 #include "content/common/socket_stream.h"
 #include "content/common/socket_stream_messages.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/common/socket_stream_dispatcher.h b/content/common/socket_stream_dispatcher.h
index 38da8a6..3ce0eba 100644
--- a/chrome/common/socket_stream_dispatcher.h
+++ b/content/common/socket_stream_dispatcher.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
-#ifndef CHROME_COMMON_SOCKET_STREAM_DISPATCHER_H_
-#define CHROME_COMMON_SOCKET_STREAM_DISPATCHER_H_
+#ifndef CONTENT_COMMON_SOCKET_STREAM_DISPATCHER_H_
+#define CONTENT_COMMON_SOCKET_STREAM_DISPATCHER_H_
 #pragma once
 
 #include <vector>
@@ -45,4 +45,4 @@ class SocketStreamDispatcher : public IPC::Channel::Listener {
   DISALLOW_COPY_AND_ASSIGN(SocketStreamDispatcher);
 };
 
-#endif  // CHROME_COMMON_SOCKET_STREAM_DISPATCHER_H_
+#endif  // CONTENT_COMMON_SOCKET_STREAM_DISPATCHER_H_
diff --git a/chrome/common/socket_stream_dispatcher_dummy.cc b/content/common/socket_stream_dispatcher_dummy.cc
index ef49285d..eef622a 100644
--- a/chrome/common/socket_stream_dispatcher_dummy.cc
+++ b/content/common/socket_stream_dispatcher_dummy.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "chrome/common/socket_stream_dispatcher.h"
+#include "content/common/socket_stream_dispatcher.h"
 
 #include "base/compiler_specific.h"
 
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 9021f5f..2ed0f13 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -14,7 +14,11 @@
         '..',
       ],
       'sources': [
+        'common/child_process.cc',
+        'common/child_process.h',
         'common/child_process_messages.h',
+        'common/child_thread.cc',
+        'common/child_thread.h',
         'common/common_param_traits.cc',
         'common/common_param_traits.h',
         'common/content_message_generator.cc',
@@ -23,6 +27,14 @@
         'common/content_constants.h',
         'common/content_switches.cc',
         'common/content_switches.h',
+        'common/file_system/file_system_dispatcher.cc',
+        'common/file_system/file_system_dispatcher.h',
+        'common/file_system/webfilesystem_callback_dispatcher.cc',
+        'common/file_system/webfilesystem_callback_dispatcher.h',
+        'common/file_system/webfilesystem_impl.cc',
+        'common/file_system/webfilesystem_impl.h',
+        'common/file_system/webfilewriter_impl.cc',
+        'common/file_system/webfilewriter_impl.h',
         'common/file_system_messages.h',
         'common/message_router.cc',
         'common/message_router.h',
@@ -45,6 +57,8 @@
         'common/resource_response.cc',
         'common/resource_response.h',
         'common/socket_stream.h',
+        'common/socket_stream_dispatcher.cc',
+        'common/socket_stream_dispatcher.h',
         'common/socket_stream_messages.h',
       ],
       'conditions': [