Move all the message files in chrome that belong in content.

TBR=avi
Review URL: http://codereview.chromium.org/6672057

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

62 files changed, 106 insertions, 112 deletions

diff --git a/chrome/browser/idbbindingutilities_browsertest.cc b/chrome/browser/idbbindingutilities_browsertest.cc
index 444d859..cf95cb6 100644
--- a/chrome/browser/idbbindingutilities_browsertest.cc
+++ b/chrome/browser/idbbindingutilities_browsertest.cc
@@ -5,11 +5,11 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/utility_process_host.h"
-#include "chrome/common/indexed_db_key.h"
-#include "chrome/common/serialized_script_value.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
+#include "content/common/indexed_db_key.h"
+#include "content/common/serialized_script_value.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h"
diff --git a/chrome/browser/utility_process_host.cc b/chrome/browser/utility_process_host.cc
index c715377..9f0d37f 100644
--- a/chrome/browser/utility_process_host.cc
+++ b/chrome/browser/utility_process_host.cc
@@ -11,9 +11,9 @@
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/indexed_db_key.h"
-#include "chrome/common/serialized_script_value.h"
 #include "chrome/common/utility_messages.h"
+#include "content/common/indexed_db_key.h"
+#include "content/common/serialized_script_value.h"
 #include "ipc/ipc_switches.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/ui_base_switches.h"
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index fdd5c0b..32f5cd1 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -39,7 +39,6 @@
           'common/chrome_counters.h',
           'common/chrome_version_info.cc',
           'common/chrome_version_info.h',
-          'common/clipboard_messages.h',
           'common/common_message_generator.cc',
           'common/common_message_generator.h',
           'common/common_param_traits.cc',
@@ -52,7 +51,6 @@
           'common/content_settings_types.h',
           'common/devtools_messages.cc',
           'common/devtools_messages.h',
-          'common/dom_storage_messages.h',
           'common/font_config_ipc_linux.cc',
           'common/font_config_ipc_linux.h',
           'common/geoposition.cc',
@@ -65,11 +63,6 @@
           'common/guid.h',
           'common/guid_posix.cc',
           'common/guid_win.cc',
-          'common/indexed_db_key.cc',
-          'common/indexed_db_key.h',
-          'common/indexed_db_messages.h',
-          'common/indexed_db_param_traits.cc',
-          'common/indexed_db_param_traits.h',
           'common/instant_types.h',
           'common/logging_chrome.cc',
           'common/logging_chrome.h',
@@ -84,10 +77,6 @@
           'common/nacl_messages.cc',
           'common/nacl_messages.h',
           'common/nacl_types.h',
-          'common/pepper_file_messages.cc',
-          'common/pepper_file_messages.h',
-          'common/pepper_messages.cc',
-          'common/pepper_messages.h',
           'common/process_watcher.h',
           'common/process_watcher_mac.cc',
           'common/process_watcher_posix.cc',
@@ -99,13 +88,10 @@
           'common/safebrowsing_messages.h',
           'common/sandbox_policy.cc',
           'common/sandbox_policy.h',
-          'common/serialized_script_value.cc',
-          'common/serialized_script_value.h',
           'common/set_process_title.cc',
           'common/set_process_title.h',
           'common/set_process_title_linux.cc',
           'common/set_process_title_linux.h',
-          'common/speech_input_messages.h',
           'common/switch_utils.cc',
           'common/switch_utils.h',
           'common/time_format.cc',
@@ -183,7 +169,6 @@
         'common/deprecated/event_sys.h',
         'common/desktop_notifications/active_notification_tracker.cc',
         'common/desktop_notifications/active_notification_tracker.h',
-        'common/dom_storage_common.h',
         'common/extensions/extension.cc',
         'common/extensions/extension.h',
         'common/extensions/extension_action.cc',
@@ -263,7 +248,6 @@
         'common/service_process_util_posix.cc',
         'common/service_process_util_posix.h',
         'common/service_process_util_win.cc',
-        'common/speech_input_result.h',
         'common/spellcheck_common.cc',
         'common/spellcheck_common.h',
         'common/sqlite_compiled_statement.cc',
diff --git a/chrome/common/common_message_generator.h b/chrome/common/common_message_generator.h
index 3b52043..9eb5014 100644
--- a/chrome/common/common_message_generator.h
+++ b/chrome/common/common_message_generator.h
@@ -5,10 +5,6 @@
 // Multiply-included file, hence no include guard.
 
 #include "chrome/common/autofill_messages.h"
-#include "chrome/common/clipboard_messages.h"
-#include "chrome/common/dom_storage_messages.h"
-#include "chrome/common/indexed_db_messages.h"
 #include "chrome/common/safebrowsing_messages.h"
 #include "chrome/common/service_messages.h"
-#include "chrome/common/speech_input_messages.h"
 #include "chrome/common/utility_messages.h"
diff --git a/chrome/common/render_messages_params.h b/chrome/common/render_messages_params.h
index fb4b432..d746be3 100644
--- a/chrome/common/render_messages_params.h
+++ b/chrome/common/render_messages_params.h
@@ -22,8 +22,8 @@
 #include "chrome/common/navigation_types.h"
 #include "chrome/common/page_transition_types.h"
 #include "chrome/common/renderer_preferences.h"
-#include "chrome/common/serialized_script_value.h"
 #include "chrome/common/window_container_type.h"
+#include "content/common/serialized_script_value.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_param_traits.h"
 #include "media/audio/audio_parameters.h"
diff --git a/chrome/common/utility_messages.h b/chrome/common/utility_messages.h
index c6382ce..2f4ed95 100644
--- a/chrome/common/utility_messages.h
+++ b/chrome/common/utility_messages.h
@@ -13,10 +13,10 @@
 #include "base/values.h"
 #include "chrome/common/common_param_traits.h"
 #include "chrome/common/extensions/update_manifest.h"
-#include "chrome/common/indexed_db_key.h"
-#include "chrome/common/indexed_db_param_traits.h"
-#include "chrome/common/serialized_script_value.h"
 #include "content/common/common_param_traits.h"
+#include "content/common/indexed_db_key.h"
+#include "content/common/indexed_db_param_traits.h"
+#include "content/common/serialized_script_value.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 #include "printing/backend/print_backend.h"
diff --git a/chrome/renderer/indexed_db_dispatcher.cc b/chrome/renderer/indexed_db_dispatcher.cc
index 8f19657f..b9184db 100644
--- a/chrome/renderer/indexed_db_dispatcher.cc
+++ b/chrome/renderer/indexed_db_dispatcher.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/renderer/indexed_db_dispatcher.h"
 
-#include "chrome/common/indexed_db_messages.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
 #include "chrome/renderer/renderer_webidbcursor_impl.h"
@@ -12,6 +11,7 @@
 #include "chrome/renderer/renderer_webidbindex_impl.h"
 #include "chrome/renderer/renderer_webidbobjectstore_impl.h"
 #include "chrome/renderer/renderer_webidbtransaction_impl.h"
+#include "content/common/indexed_db_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabaseCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBDatabaseError.h"
diff --git a/chrome/renderer/pepper_plugin_delegate_impl.cc b/chrome/renderer/pepper_plugin_delegate_impl.cc
index ad56c73..b9547f1 100644
--- a/chrome/renderer/pepper_plugin_delegate_impl.cc
+++ b/chrome/renderer/pepper_plugin_delegate_impl.cc
@@ -15,8 +15,6 @@
 #include "base/string_split.h"
 #include "base/task.h"
 #include "base/time.h"
-#include "chrome/common/pepper_file_messages.h"
-#include "chrome/common/pepper_messages.h"
 #include "chrome/common/pepper_plugin_registry.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
@@ -31,6 +29,8 @@
 #include "content/common/child_process_messages.h"
 #include "content/common/child_thread.h"
 #include "content/common/file_system/file_system_dispatcher.h"
+#include "content/common/pepper_file_messages.h"
+#include "content/common/pepper_messages.h"
 #include "content/renderer/ggl.h"
 #include "grit/locale_settings.h"
 #include "ipc/ipc_channel_handle.h"
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index ac1fe0f..c9ddbcf 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -24,7 +24,6 @@
 #include "base/values.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/dom_storage_messages.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_localization_peer.h"
 #include "chrome/common/extensions/extension_set.h"
@@ -63,6 +62,7 @@
 #include "content/common/appcache/appcache_dispatcher.h"
 #include "content/common/database_messages.h"
 #include "content/common/db_message_filter.h"
+#include "content/common/dom_storage_messages.h"
 #include "content/common/gpu_messages.h"
 #include "content/common/plugin_messages.h"
 #include "content/common/resource_dispatcher.h"
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 472e6eb..ec6cc55 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -28,14 +28,12 @@
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/clipboard_messages.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/page_zoom.h"
-#include "chrome/common/pepper_messages.h"
 #include "chrome/common/pepper_plugin_registry.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
@@ -96,11 +94,13 @@
 #include "chrome/renderer/websharedworker_proxy.h"
 #include "chrome/renderer/webworker_proxy.h"
 #include "content/common/appcache/appcache_dispatcher.h"
+#include "content/common/clipboard_messages.h"
 #include "content/common/content_constants.h"
 #include "content/common/database_messages.h"
 #include "content/common/file_system/file_system_dispatcher.h"
 #include "content/common/file_system/webfilesystem_callback_dispatcher.h"
 #include "content/common/notification_service.h"
+#include "content/common/pepper_messages.h"
 #include "content/renderer/ggl.h"
 #include "content/renderer/media/audio_renderer_impl.h"
 #include "content/renderer/media/ipc_video_decoder.h"
diff --git a/chrome/renderer/renderer_glue.cc b/chrome/renderer/renderer_glue.cc
index 9328c69..d122fd7 100644
--- a/chrome/renderer/renderer_glue.cc
+++ b/chrome/renderer/renderer_glue.cc
@@ -18,12 +18,12 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
-#include "chrome/common/clipboard_messages.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/renderer/net/renderer_net_predictor.h"
 #include "chrome/renderer/render_process.h"
 #include "chrome/renderer/render_thread.h"
+#include "content/common/clipboard_messages.h"
 #include "content/common/socket_stream_dispatcher.h"
 #include "content/plugin/npobject_util.h"
 #include "googleurl/src/url_util.h"
diff --git a/chrome/renderer/renderer_webidbcursor_impl.cc b/chrome/renderer/renderer_webidbcursor_impl.cc
index 69d84bf..d0aa1be 100644
--- a/chrome/renderer/renderer_webidbcursor_impl.cc
+++ b/chrome/renderer/renderer_webidbcursor_impl.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/renderer/renderer_webidbcursor_impl.h"
 
-#include "chrome/common/indexed_db_messages.h"
 #include "chrome/renderer/indexed_db_dispatcher.h"
 #include "chrome/renderer/render_thread.h"
+#include "content/common/indexed_db_messages.h"
 
 using WebKit::WebExceptionCode;
 using WebKit::WebIDBCallbacks;
diff --git a/chrome/renderer/renderer_webidbcursor_impl.h b/chrome/renderer/renderer_webidbcursor_impl.h
index 2c39b7e..4d3723d 100644
--- a/chrome/renderer/renderer_webidbcursor_impl.h
+++ b/chrome/renderer/renderer_webidbcursor_impl.h
@@ -6,8 +6,8 @@
 #define CHROME_RENDERER_RENDERER_WEBIDBCURSOR_IMPL_H_
 
 #include "base/basictypes.h"
-#include "chrome/common/indexed_db_key.h"
-#include "chrome/common/serialized_script_value.h"
+#include "content/common/indexed_db_key.h"
+#include "content/common/serialized_script_value.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBCursor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h"
diff --git a/chrome/renderer/renderer_webidbdatabase_impl.cc b/chrome/renderer/renderer_webidbdatabase_impl.cc
index e7b7a32..159fe07 100644
--- a/chrome/renderer/renderer_webidbdatabase_impl.cc
+++ b/chrome/renderer/renderer_webidbdatabase_impl.cc
@@ -4,11 +4,11 @@
 
 #include "chrome/renderer/renderer_webidbdatabase_impl.h"
 
-#include "chrome/common/indexed_db_messages.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/indexed_db_dispatcher.h"
 #include "chrome/renderer/renderer_webidbobjectstore_impl.h"
 #include "chrome/renderer/renderer_webidbtransaction_impl.h"
+#include "content/common/indexed_db_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
 
diff --git a/chrome/renderer/renderer_webidbindex_impl.cc b/chrome/renderer/renderer_webidbindex_impl.cc
index 2e40e6637..d67fe38 100644
--- a/chrome/renderer/renderer_webidbindex_impl.cc
+++ b/chrome/renderer/renderer_webidbindex_impl.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/renderer/renderer_webidbindex_impl.h"
 
-#include "chrome/common/indexed_db_messages.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/indexed_db_dispatcher.h"
 #include "chrome/renderer/renderer_webidbtransaction_impl.h"
+#include "content/common/indexed_db_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h"
 
diff --git a/chrome/renderer/renderer_webidbobjectstore_impl.cc b/chrome/renderer/renderer_webidbobjectstore_impl.cc
index dc883bd..99bce34 100644
--- a/chrome/renderer/renderer_webidbobjectstore_impl.cc
+++ b/chrome/renderer/renderer_webidbobjectstore_impl.cc
@@ -4,12 +4,12 @@
 
 #include "chrome/renderer/renderer_webidbobjectstore_impl.h"
 
-#include "chrome/common/indexed_db_messages.h"
-#include "chrome/common/serialized_script_value.h"
 #include "chrome/renderer/indexed_db_dispatcher.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/renderer_webidbindex_impl.h"
 #include "chrome/renderer/renderer_webidbtransaction_impl.h"
+#include "content/common/indexed_db_messages.h"
+#include "content/common/serialized_script_value.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMStringList.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyRange.h"
diff --git a/chrome/renderer/renderer_webidbtransaction_impl.cc b/chrome/renderer/renderer_webidbtransaction_impl.cc
index af8648c..b65f5a9 100644
--- a/chrome/renderer/renderer_webidbtransaction_impl.cc
+++ b/chrome/renderer/renderer_webidbtransaction_impl.cc
@@ -4,10 +4,10 @@
 
 #include "chrome/renderer/renderer_webidbtransaction_impl.h"
 
-#include "chrome/common/indexed_db_messages.h"
 #include "chrome/renderer/indexed_db_dispatcher.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/renderer_webidbobjectstore_impl.h"
+#include "content/common/indexed_db_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBObjectStore.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBTransactionCallbacks.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
diff --git a/chrome/renderer/renderer_webstoragearea_impl.cc b/chrome/renderer/renderer_webstoragearea_impl.cc
index 90559cd..fdc30c4 100644
--- a/chrome/renderer/renderer_webstoragearea_impl.cc
+++ b/chrome/renderer/renderer_webstoragearea_impl.cc
@@ -4,9 +4,9 @@
 
 #include "chrome/renderer/renderer_webstoragearea_impl.h"
 
-#include "chrome/common/dom_storage_messages.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
+#include "content/common/dom_storage_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
diff --git a/chrome/renderer/renderer_webstoragenamespace_impl.h b/chrome/renderer/renderer_webstoragenamespace_impl.h
index 0abfefd..7b03f32 100644
--- a/chrome/renderer/renderer_webstoragenamespace_impl.h
+++ b/chrome/renderer/renderer_webstoragenamespace_impl.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
-#include "chrome/common/dom_storage_common.h"
+#include "content/common/dom_storage_common.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h"
 
 class RendererWebStorageNamespaceImpl : public WebKit::WebStorageNamespace {
diff --git a/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc b/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc
index b6aa02f..e689196 100644
--- a/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc
+++ b/chrome/renderer/safe_browsing/render_view_fake_resources_test.cc
@@ -9,13 +9,13 @@
 #include "base/command_line.h"
 #include "base/process.h"
 #include "base/shared_memory.h"
-#include "chrome/common/dom_storage_common.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
 #include "chrome/renderer/mock_render_process.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
 #include "chrome/renderer/renderer_main_platform_delegate.h"
+#include "content/common/dom_storage_common.h"
 #include "content/common/main_function_params.h"
 #include "content/common/resource_messages.h"
 #include "content/common/resource_response.h"
diff --git a/chrome/renderer/speech_input_dispatcher.cc b/chrome/renderer/speech_input_dispatcher.cc
index ec2b0a9..261357a 100644
--- a/chrome/renderer/speech_input_dispatcher.cc
+++ b/chrome/renderer/speech_input_dispatcher.cc
@@ -5,8 +5,8 @@
 #include "chrome/renderer/speech_input_dispatcher.h"
 
 #include "base/utf_string_conversions.h"
-#include "chrome/common/speech_input_messages.h"
 #include "chrome/renderer/render_view.h"
+#include "content/common/speech_input_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
diff --git a/chrome/renderer/speech_input_dispatcher.h b/chrome/renderer/speech_input_dispatcher.h
index 1ec07b6..2fd9877 100644
--- a/chrome/renderer/speech_input_dispatcher.h
+++ b/chrome/renderer/speech_input_dispatcher.h
@@ -6,8 +6,8 @@
 #define CHROME_RENDERER_SPEECH_INPUT_DISPATCHER_H_
 
 #include "base/basictypes.h"
-#include "chrome/common/speech_input_result.h"
 #include "chrome/renderer/render_view_observer.h"
+#include "content/common/speech_input_result.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSpeechInputController.h"
 
 class GURL;
diff --git a/chrome/test/render_view_test.cc b/chrome/test/render_view_test.cc
index 95a7b28..1a730f8 100644
--- a/chrome/test/render_view_test.cc
+++ b/chrome/test/render_view_test.cc
@@ -5,7 +5,6 @@
 #include "chrome/test/render_view_test.h"
 
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
-#include "chrome/common/dom_storage_common.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "chrome/common/render_messages.h"
@@ -19,6 +18,7 @@
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
 #include "chrome/renderer/mock_render_process.h"
 #include "chrome/renderer/renderer_main_platform_delegate.h"
+#include "content/common/dom_storage_common.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
diff --git a/chrome/utility/utility_thread.cc b/chrome/utility/utility_thread.cc
index 91b1574..7b665ae 100644
--- a/chrome/utility/utility_thread.cc
+++ b/chrome/utility/utility_thread.cc
@@ -13,11 +13,11 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension_unpacker.h"
 #include "chrome/common/extensions/update_manifest.h"
-#include "chrome/common/indexed_db_key.h"
-#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 "content/common/indexed_db_key.h"
+#include "content/common/serialized_script_value.h"
 #include "printing/page_range.h"
 #include "printing/units.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/content/browser/in_process_webkit/browser_webkitclient_impl.cc b/content/browser/in_process_webkit/browser_webkitclient_impl.cc
index 2d086680..4506fc2 100644
--- a/content/browser/in_process_webkit/browser_webkitclient_impl.cc
+++ b/content/browser/in_process_webkit/browser_webkitclient_impl.cc
@@ -6,10 +6,10 @@
 
 #include "base/file_util.h"
 #include "base/logging.h"
-#include "chrome/common/indexed_db_key.h"
-#include "chrome/common/serialized_script_value.h"
 #include "content/browser/in_process_webkit/dom_storage_message_filter.h"
 #include "content/browser/in_process_webkit/indexed_db_key_utility_client.h"
+#include "content/common/indexed_db_key.h"
+#include "content/common/serialized_script_value.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebData.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
diff --git a/content/browser/in_process_webkit/dom_storage_area.h b/content/browser/in_process_webkit/dom_storage_area.h
index e451f8b..d7e7d8c 100644
--- a/content/browser/in_process_webkit/dom_storage_area.h
+++ b/content/browser/in_process_webkit/dom_storage_area.h
@@ -11,7 +11,7 @@
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
-#include "chrome/common/dom_storage_common.h"
+#include "content/common/dom_storage_common.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageArea.h"
 
diff --git a/content/browser/in_process_webkit/dom_storage_context.cc b/content/browser/in_process_webkit/dom_storage_context.cc
index 245c08c..96b83c7 100644
--- a/content/browser/in_process_webkit/dom_storage_context.cc
+++ b/content/browser/in_process_webkit/dom_storage_context.cc
@@ -10,12 +10,12 @@
 #include "base/file_util.h"
 #include "base/string_util.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
-#include "chrome/common/dom_storage_common.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/in_process_webkit/dom_storage_area.h"
 #include "content/browser/in_process_webkit/dom_storage_namespace.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
+#include "content/common/dom_storage_common.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "webkit/glue/webkit_glue.h"
diff --git a/content/browser/in_process_webkit/dom_storage_message_filter.cc b/content/browser/in_process_webkit/dom_storage_message_filter.cc
index 3043dbb..6d92998 100644
--- a/content/browser/in_process_webkit/dom_storage_message_filter.cc
+++ b/content/browser/in_process_webkit/dom_storage_message_filter.cc
@@ -8,13 +8,13 @@
 #include "chrome/browser/metrics/user_metrics.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
-#include "chrome/common/dom_storage_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/in_process_webkit/dom_storage_area.h"
 #include "content/browser/in_process_webkit/dom_storage_context.h"
 #include "content/browser/in_process_webkit/dom_storage_namespace.h"
 #include "content/browser/renderer_host/render_view_host_notification_task.h"
+#include "content/common/dom_storage_messages.h"
 #include "googleurl/src/gurl.h"
 
 using WebKit::WebStorageArea;
diff --git a/content/browser/in_process_webkit/dom_storage_message_filter.h b/content/browser/in_process_webkit/dom_storage_message_filter.h
index 0140eef..7113d8f 100644
--- a/content/browser/in_process_webkit/dom_storage_message_filter.h
+++ b/content/browser/in_process_webkit/dom_storage_message_filter.h
@@ -10,11 +10,10 @@
 #include "base/ref_counted.h"
 #include "base/tracked.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
-#include "chrome/common/dom_storage_common.h"
 #include "content/browser/browser_message_filter.h"
 #include "content/browser/in_process_webkit/dom_storage_area.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
-#include "ipc/ipc_message.h"
+#include "content/common/dom_storage_common.h"
 
 class DOMStorageContext;
 class GURL;
diff --git a/content/browser/in_process_webkit/dom_storage_namespace.h b/content/browser/in_process_webkit/dom_storage_namespace.h
index b05a317..3abe334 100644
--- a/content/browser/in_process_webkit/dom_storage_namespace.h
+++ b/content/browser/in_process_webkit/dom_storage_namespace.h
@@ -9,7 +9,7 @@
 #include "base/hash_tables.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
-#include "chrome/common/dom_storage_common.h"
+#include "content/common/dom_storage_common.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 
 class DOMStorageArea;
diff --git a/content/browser/in_process_webkit/indexed_db_callbacks.cc b/content/browser/in_process_webkit/indexed_db_callbacks.cc
index 52787fd..74ae15b 100644
--- a/content/browser/in_process_webkit/indexed_db_callbacks.cc
+++ b/content/browser/in_process_webkit/indexed_db_callbacks.cc
@@ -4,7 +4,7 @@
 
 #include "content/browser/in_process_webkit/indexed_db_callbacks.h"
 
-#include "chrome/common/indexed_db_messages.h"
+#include "content/common/indexed_db_messages.h"
 
 IndexedDBCallbacksBase::IndexedDBCallbacksBase(
     IndexedDBDispatcherHost* dispatcher_host,
diff --git a/content/browser/in_process_webkit/indexed_db_database_callbacks.cc b/content/browser/in_process_webkit/indexed_db_database_callbacks.cc
index 29103ce..2c23aa5 100644
--- a/content/browser/in_process_webkit/indexed_db_database_callbacks.cc
+++ b/content/browser/in_process_webkit/indexed_db_database_callbacks.cc
@@ -4,8 +4,8 @@
 
 #include "content/browser/in_process_webkit/indexed_db_database_callbacks.h"
 
-#include "chrome/common/indexed_db_messages.h"
 #include "content/browser/in_process_webkit/indexed_db_dispatcher_host.h"
+#include "content/common/indexed_db_messages.h"
 
 IndexedDBDatabaseCallbacks::IndexedDBDatabaseCallbacks(
     IndexedDBDispatcherHost* dispatcher_host,
diff --git a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
index 3fde86f..7581c4d7 100644
--- a/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
+++ b/content/browser/in_process_webkit/indexed_db_dispatcher_host.cc
@@ -11,13 +11,13 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/indexed_db_messages.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/in_process_webkit/indexed_db_callbacks.h"
 #include "content/browser/in_process_webkit/indexed_db_database_callbacks.h"
 #include "content/browser/in_process_webkit/indexed_db_transaction_callbacks.h"
 #include "content/browser/renderer_host/render_message_filter.h"
 #include "content/browser/renderer_host/render_view_host_notification_task.h"
+#include "content/common/indexed_db_messages.h"
 #include "chrome/common/result_codes.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDOMStringList.h"
diff --git a/content/browser/in_process_webkit/indexed_db_key_utility_client.cc b/content/browser/in_process_webkit/indexed_db_key_utility_client.cc
index a8f8e5b..d3e0300 100644
--- a/content/browser/in_process_webkit/indexed_db_key_utility_client.cc
+++ b/content/browser/in_process_webkit/indexed_db_key_utility_client.cc
@@ -8,8 +8,8 @@
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/utility_process_host.h"
-#include "chrome/common/indexed_db_key.h"
-#include "chrome/common/serialized_script_value.h"
+#include "content/common/indexed_db_key.h"
+#include "content/common/serialized_script_value.h"
 
 // This class is used to obtain IndexedDBKeys from SerializedScriptValues
 // given an IDBKeyPath. It uses UtilityProcess to do this inside a sandbox
diff --git a/content/browser/in_process_webkit/indexed_db_transaction_callbacks.cc b/content/browser/in_process_webkit/indexed_db_transaction_callbacks.cc
index 0690068..c806242 100644
--- a/content/browser/in_process_webkit/indexed_db_transaction_callbacks.cc
+++ b/content/browser/in_process_webkit/indexed_db_transaction_callbacks.cc
@@ -4,8 +4,8 @@
 
 #include "content/browser/in_process_webkit/indexed_db_transaction_callbacks.h"
 
-#include "chrome/common/indexed_db_messages.h"
 #include "content/browser/in_process_webkit/indexed_db_dispatcher_host.h"
+#include "content/common/indexed_db_messages.h"
 
 IndexedDBTransactionCallbacks::IndexedDBTransactionCallbacks(
     IndexedDBDispatcherHost* dispatcher_host,
diff --git a/content/browser/renderer_host/clipboard_message_filter.cc b/content/browser/renderer_host/clipboard_message_filter.cc
index 741d435..a48d918 100644
--- a/content/browser/renderer_host/clipboard_message_filter.cc
+++ b/content/browser/renderer_host/clipboard_message_filter.cc
@@ -6,7 +6,7 @@
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/clipboard_dispatcher.h"
-#include "chrome/common/clipboard_messages.h"
+#include "content/common/clipboard_messages.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
 
diff --git a/content/browser/renderer_host/pepper_file_message_filter.cc b/content/browser/renderer_host/pepper_file_message_filter.cc
index b951b5d..a4f1535 100644
--- a/content/browser/renderer_host/pepper_file_message_filter.cc
+++ b/content/browser/renderer_host/pepper_file_message_filter.cc
@@ -11,9 +11,9 @@
 #include "base/process_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
-#include "chrome/common/pepper_file_messages.h"
 #include "content/browser/browser_thread.h"
 #include "content/browser/child_process_security_policy.h"
+#include "content/common/pepper_file_messages.h"
 #include "ipc/ipc_platform_file.h"
 #include "webkit/plugins/ppapi/file_path.h"
 
diff --git a/content/browser/renderer_host/pepper_message_filter.cc b/content/browser/renderer_host/pepper_message_filter.cc
index d19029a..ef6a37f 100644
--- a/content/browser/renderer_host/pepper_message_filter.cc
+++ b/content/browser/renderer_host/pepper_message_filter.cc
@@ -10,8 +10,8 @@
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_host/browser_render_process_host.h"
-#include "chrome/common/pepper_messages.h"
 #include "content/browser/browser_thread.h"
+#include "content/common/pepper_messages.h"
 #include "net/base/address_list.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/host_resolver.h"
diff --git a/content/browser/renderer_host/render_view_host_delegate.h b/content/browser/renderer_host/render_view_host_delegate.h
index 53fda27..b50318b 100644
--- a/content/browser/renderer_host/render_view_host_delegate.h
+++ b/content/browser/renderer_host/render_view_host_delegate.h
@@ -14,10 +14,10 @@
 #include "base/ref_counted.h"
 #include "base/string16.h"
 #include "chrome/common/content_settings_types.h"
-#include "chrome/common/dom_storage_common.h"
 #include "chrome/common/translate_errors.h"
 #include "chrome/common/view_types.h"
 #include "chrome/common/window_container_type.h"
+#include "content/common/dom_storage_common.h"
 #include "ipc/ipc_channel.h"
 #include "net/base/load_states.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h"
diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc
index 3f4f200..5707937 100644
--- a/content/browser/renderer_host/test_render_view_host.cc
+++ b/content/browser/renderer_host/test_render_view_host.cc
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/browser_url_handler.h"
-#include "chrome/common/dom_storage_common.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/render_messages_params.h"
 #include "chrome/test/testing_profile.h"
@@ -13,6 +12,7 @@
 #include "content/browser/tab_contents/navigation_controller.h"
 #include "content/browser/tab_contents/test_tab_contents.h"
 #include "content/common/content_client.h"
+#include "content/common/dom_storage_common.h"
 #include "ui/gfx/rect.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webpreferences.h"
diff --git a/content/browser/speech/speech_input_dispatcher_host.cc b/content/browser/speech/speech_input_dispatcher_host.cc
index d721fee..b589e3b 100644
--- a/content/browser/speech/speech_input_dispatcher_host.cc
+++ b/content/browser/speech/speech_input_dispatcher_host.cc
@@ -5,7 +5,7 @@
 #include "content/browser/speech/speech_input_dispatcher_host.h"
 
 #include "base/lazy_instance.h"
-#include "chrome/common/speech_input_messages.h"
+#include "content/common/speech_input_messages.h"
 
 namespace speech_input {
 
diff --git a/content/browser/speech/speech_input_manager.h b/content/browser/speech/speech_input_manager.h
index c990e8c..342f2c1 100644
--- a/content/browser/speech/speech_input_manager.h
+++ b/content/browser/speech/speech_input_manager.h
@@ -6,7 +6,7 @@
 #define CONTENT_BROWSER_SPEECH_SPEECH_INPUT_MANAGER_H_
 
 #include "base/basictypes.h"
-#include "chrome/common/speech_input_result.h"
+#include "content/common/speech_input_result.h"
 #include "ui/gfx/rect.h"
 
 namespace speech_input {
diff --git a/content/browser/speech/speech_recognition_request.h b/content/browser/speech/speech_recognition_request.h
index 3bb6298..5c94fba 100644
--- a/content/browser/speech/speech_recognition_request.h
+++ b/content/browser/speech/speech_recognition_request.h
@@ -12,7 +12,7 @@
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/net/url_fetcher.h"
-#include "chrome/common/speech_input_result.h"
+#include "content/common/speech_input_result.h"
 #include "googleurl/src/gurl.h"
 
 class URLFetcher;
diff --git a/content/browser/tab_contents/interstitial_page.cc b/content/browser/tab_contents/interstitial_page.cc
index 2cd09b8..cedc485 100644
--- a/content/browser/tab_contents/interstitial_page.cc
+++ b/content/browser/tab_contents/interstitial_page.cc
@@ -17,7 +17,6 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/common/bindings_policy.h"
-#include "chrome/common/dom_storage_common.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/page_transition_types.h"
 #include "chrome/common/render_messages_params.h"
@@ -31,6 +30,7 @@
 #include "content/browser/tab_contents/navigation_entry.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
+#include "content/common/dom_storage_common.h"
 #include "content/common/notification_service.h"
 #include "content/common/notification_source.h"
 #include "net/base/escape.h"
diff --git a/chrome/common/clipboard_messages.h b/content/common/clipboard_messages.h
index 7fe14af..7fe14af 100644
--- a/chrome/common/clipboard_messages.h
+++ b/content/common/clipboard_messages.h
diff --git a/content/common/content_message_generator.h b/content/common/content_message_generator.h
index f068598..d6ac72f36 100644
--- a/content/common/content_message_generator.h
+++ b/content/common/content_message_generator.h
@@ -6,14 +6,18 @@
 
 #include "content/common/appcache_messages.h"
 #include "content/common/child_process_messages.h"
+#include "content/common/clipboard_messages.h"
 #include "content/common/database_messages.h"
+#include "content/common/dom_storage_messages.h"
 #include "content/common/file_system_messages.h"
 #include "content/common/file_utilities_messages.h"
-#include "content/common/p2p_messages.h"
-#include "content/common/plugin_messages.h"
 #include "content/common/gpu_messages.h"
+#include "content/common/indexed_db_messages.h"
 #include "content/common/mime_registry_messages.h"
+#include "content/common/p2p_messages.h"
+#include "content/common/plugin_messages.h"
 #include "content/common/resource_messages.h"
+#include "content/common/speech_input_messages.h"
 #include "content/common/socket_stream_messages.h"
 #include "content/common/webblob_messages.h"
 #include "content/common/worker_messages.h"
diff --git a/chrome/common/dom_storage_common.h b/content/common/dom_storage_common.h
index 5946384..64d35e5 100644
--- a/chrome/common/dom_storage_common.h
+++ b/content/common/dom_storage_common.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_DOM_STORAGE_COMMON_H_
-#define CHROME_COMMON_DOM_STORAGE_COMMON_H_
+#ifndef CONTENT_COMMON_DOM_STORAGE_COMMON_H_
+#define CONTENT_COMMON_DOM_STORAGE_COMMON_H_
 #pragma once
 
 #include "build/build_config.h"
@@ -18,4 +18,4 @@ enum DOMStorageType {
   DOM_STORAGE_SESSION
 };
 
-#endif  // CHROME_COMMON_DOM_STORAGE_COMMON_H_
+#endif  // CONTENT_COMMON_DOM_STORAGE_COMMON_H_
diff --git a/chrome/common/dom_storage_messages.h b/content/common/dom_storage_messages.h
index 6b41750..9d656f6 100644
--- a/chrome/common/dom_storage_messages.h
+++ b/content/common/dom_storage_messages.h
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 // Multiply-included message file, no traditional include guard.
-#include "chrome/common/dom_storage_common.h"
+#include "content/common/dom_storage_common.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
diff --git a/chrome/common/indexed_db_key.cc b/content/common/indexed_db_key.cc
index ad02858..ee02fa1 100644
--- a/chrome/common/indexed_db_key.cc
+++ b/content/common/indexed_db_key.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 "chrome/common/indexed_db_key.h"
+#include "content/common/indexed_db_key.h"
 
 #include "base/logging.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
diff --git a/chrome/common/indexed_db_key.h b/content/common/indexed_db_key.h
index 47f1872..04a4b60 100644
--- a/chrome/common/indexed_db_key.h
+++ b/content/common/indexed_db_key.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_INDEXED_DB_KEY_H_
-#define CHROME_COMMON_INDEXED_DB_KEY_H_
+#ifndef CONTENT_COMMON_INDEXED_DB_KEY_H_
+#define CONTENT_COMMON_INDEXED_DB_KEY_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -37,4 +37,4 @@ class IndexedDBKey {
   double number_;
 };
 
-#endif  // CHROME_COMMON_INDEXED_DB_KEY_H_
+#endif  // CONTENT_COMMON_INDEXED_DB_KEY_H_
diff --git a/chrome/common/indexed_db_messages.h b/content/common/indexed_db_messages.h
index 201253c..0a6b37d 100644
--- a/chrome/common/indexed_db_messages.h
+++ b/content/common/indexed_db_messages.h
@@ -6,9 +6,9 @@
 
 #include <vector>
 
-#include "chrome/common/indexed_db_key.h"
-#include "chrome/common/indexed_db_param_traits.h"
-#include "chrome/common/serialized_script_value.h"
+#include "content/common/indexed_db_key.h"
+#include "content/common/indexed_db_param_traits.h"
+#include "content/common/serialized_script_value.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebExceptionCode.h"
diff --git a/chrome/common/indexed_db_param_traits.cc b/content/common/indexed_db_param_traits.cc
index 70c10ff..4c9d5ab 100644
--- a/chrome/common/indexed_db_param_traits.cc
+++ b/content/common/indexed_db_param_traits.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 "chrome/common/indexed_db_param_traits.h"
+#include "content/common/indexed_db_param_traits.h"
 
-#include "chrome/common/indexed_db_key.h"
-#include "chrome/common/serialized_script_value.h"
+#include "content/common/indexed_db_key.h"
+#include "content/common/serialized_script_value.h"
 #include "ipc/ipc_message_utils.h"
 
 namespace IPC {
diff --git a/chrome/common/indexed_db_param_traits.h b/content/common/indexed_db_param_traits.h
index 2e43f3e..2045bdd 100644
--- a/chrome/common/indexed_db_param_traits.h
+++ b/content/common/indexed_db_param_traits.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_INDEXED_DB_PARAM_TRAITS_H_
-#define CHROME_COMMON_INDEXED_DB_PARAM_TRAITS_H_
+#ifndef CONTENT_COMMON_INDEXED_DB_PARAM_TRAITS_H_
+#define CONTENT_COMMON_INDEXED_DB_PARAM_TRAITS_H_
 #pragma once
 
 #include "ipc/ipc_message.h"
@@ -37,4 +37,4 @@ struct ParamTraits<IndexedDBKey> {
 
 } // namespace IPC
 
-#endif  // CHROME_COMMON_INDEXED_DB_PARAM_TRAITS_H_
+#endif  // CONTENT_COMMON_INDEXED_DB_PARAM_TRAITS_H_
diff --git a/chrome/common/pepper_file_messages.cc b/content/common/pepper_file_messages.cc
index c4bd665..f84ba89 100644
--- a/chrome/common/pepper_file_messages.cc
+++ b/content/common/pepper_file_messages.cc
@@ -2,10 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/common_param_traits.h"
-
 #define IPC_MESSAGE_IMPL
-#include "chrome/common/pepper_file_messages.h"
+#include "content/common/pepper_file_messages.h"
 
 namespace IPC {
 
diff --git a/chrome/common/pepper_file_messages.h b/content/common/pepper_file_messages.h
index 2825623..2825623 100644
--- a/chrome/common/pepper_file_messages.h
+++ b/content/common/pepper_file_messages.h
diff --git a/chrome/common/pepper_messages.cc b/content/common/pepper_messages.cc
index 807618d..b2a8f63 100644
--- a/chrome/common/pepper_messages.cc
+++ b/content/common/pepper_messages.cc
@@ -2,11 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/common_param_traits.h"
 #include "ppapi/c/private/ppb_flash_net_connector.h"
 
 #define IPC_MESSAGE_IMPL
-#include "chrome/common/pepper_messages.h"
+#include "content/common/pepper_messages.h"
 
 namespace IPC {
 
diff --git a/chrome/common/pepper_messages.h b/content/common/pepper_messages.h
index 5330438..440a2c8 100644
--- a/chrome/common/pepper_messages.h
+++ b/content/common/pepper_messages.h
@@ -3,15 +3,14 @@
 // found in the LICENSE file.
 
 // Multiply-included message file, no traditional include guard
-#include "chrome/common/common_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
 #include "ipc/ipc_platform_file.h"
 #include "ppapi/c/private/ppb_flash_net_connector.h"
 
 // Singly-included section, not yet converted.
-#ifndef CHROME_COMMON_PEPPER_MESSAGES_H_
-#define CHROME_COMMON_PEPPER_MESSAGES_H_
+#ifndef CONTENT_COMMON_PEPPER_MESSAGES_H_
+#define CONTENT_COMMON_PEPPER_MESSAGES_H_
 
 namespace IPC {
 
@@ -25,9 +24,9 @@ struct ParamTraits<PP_Flash_NetAddress> {
 
 }  // namespace IPC
 
-#define IPC_MESSAGE_START PepperMsgStart
+#endif  // CONTENT_COMMON_PEPPER_MESSAGES_H_
 
-#endif  // CHROME_COMMON_PEPPER_MESSAGES_H_
+#define IPC_MESSAGE_START PepperMsgStart
 
 // Pepper (non-file-system) messages sent from the browser to the renderer.
 
diff --git a/chrome/common/serialized_script_value.cc b/content/common/serialized_script_value.cc
index 407fb97..4d6a658 100644
--- a/chrome/common/serialized_script_value.cc
+++ b/content/common/serialized_script_value.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 "chrome/common/serialized_script_value.h"
+#include "content/common/serialized_script_value.h"
 
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSerializedScriptValue.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
diff --git a/chrome/common/serialized_script_value.h b/content/common/serialized_script_value.h
index 9848d13..7352298 100644
--- a/chrome/common/serialized_script_value.h
+++ b/content/common/serialized_script_value.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_SERIALIZED_SCRIPT_VALUE_H_
-#define CHROME_COMMON_SERIALIZED_SCRIPT_VALUE_H_
+#ifndef CONTENT_COMMON_SERIALIZED_SCRIPT_VALUE_H_
+#define CONTENT_COMMON_SERIALIZED_SCRIPT_VALUE_H_
 #pragma once
 
 #include "base/string16.h"
@@ -38,4 +38,4 @@ class SerializedScriptValue {
   string16 data_; // The wire string format of the serialized script value.
 };
 
-#endif  // CHROME_COMMON_SERIALIZED_SCRIPT_VALUE_H_
+#endif  // CONTENT_COMMON_SERIALIZED_SCRIPT_VALUE_H_
diff --git a/chrome/common/speech_input_messages.h b/content/common/speech_input_messages.h
index 8080db9..df7f90f 100644
--- a/chrome/common/speech_input_messages.h
+++ b/content/common/speech_input_messages.h
@@ -6,8 +6,7 @@
 
 #include <string>
 
-#include "chrome/common/common_param_traits.h"
-#include "chrome/common/speech_input_result.h"
+#include "content/common/speech_input_result.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
 #include "ui/gfx/rect.h"
diff --git a/chrome/common/speech_input_result.h b/content/common/speech_input_result.h
index 2807412..ed85959 100644
--- a/chrome/common/speech_input_result.h
+++ b/content/common/speech_input_result.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_SPEECH_INPUT_RESULT_H_
-#define CHROME_COMMON_SPEECH_INPUT_RESULT_H_
+#ifndef CONTENT_COMMON_SPEECH_INPUT_RESULT_H_
+#define CONTENT_COMMON_SPEECH_INPUT_RESULT_H_
 
 #include <vector>
 
@@ -30,4 +30,4 @@ typedef std::vector<SpeechInputResultItem> SpeechInputResultArray;
 
 }  // namespace speech_input
 
-#endif  // CHROME_COMMON_SPEECH_INPUT_RESULT_H_
+#endif  // CONTENT_COMMON_SPEECH_INPUT_RESULT_H_
diff --git a/content/content_common.gypi b/content/content_common.gypi
index baa119f4..e2ff9ee 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -37,6 +37,7 @@
         'common/child_thread.h',
         'common/chrome_application_mac.h',
         'common/chrome_application_mac.mm',
+        'common/clipboard_messages.h',
         'common/common_param_traits.cc',
         'common/common_param_traits.h',
         'common/content_message_generator.cc',
@@ -58,6 +59,8 @@
         'common/debug_flags.h',
         'common/dx_diag_node.cc',
         'common/dx_diag_node.h',
+        'common/dom_storage_common.h',
+        'common/dom_storage_messages.h',
         'common/file_system/file_system_dispatcher.cc',
         'common/file_system/file_system_dispatcher.h',
         'common/file_system/webfilesystem_callback_dispatcher.cc',
@@ -78,6 +81,11 @@
         'common/hi_res_timer_manager_posix.cc',
         'common/hi_res_timer_manager_win.cc',
         'common/hi_res_timer_manager.h',
+        'common/indexed_db_key.cc',
+        'common/indexed_db_key.h',
+        'common/indexed_db_messages.h',
+        'common/indexed_db_param_traits.cc',
+        'common/indexed_db_param_traits.h',
         'common/main_function_params.h',          
         'common/message_router.cc',
         'common/message_router.h',
@@ -94,6 +102,10 @@
         'common/notification_type.h',
         'common/p2p_messages.h',
         'common/p2p_sockets.h',
+        'common/pepper_file_messages.cc',
+        'common/pepper_file_messages.h',
+        'common/pepper_messages.cc',
+        'common/pepper_messages.h',
         'common/plugin_carbon_interpose_constants_mac.cc',
         'common/plugin_carbon_interpose_constants_mac.h',
         'common/plugin_messages.h',
@@ -112,10 +124,14 @@
         'common/sandbox_mac.mm',
         'common/section_util_win.cc',
         'common/section_util_win.h',
+        'common/serialized_script_value.cc',
+        'common/serialized_script_value.h',
         'common/socket_stream.h',
         'common/socket_stream_dispatcher.cc',
         'common/socket_stream_dispatcher.h',
         'common/socket_stream_messages.h',
+        'common/speech_input_messages.h',
+        'common/speech_input_result.h',
         'common/web_database_observer_impl.cc',
         'common/web_database_observer_impl.h',
         'common/webblobregistry_impl.cc',