Move common_param_traits and webkit_param_traits to content/public/common.

BUG=98716
Review URL: http://codereview.chromium.org/8368004

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

31 files changed, 45 insertions, 44 deletions

diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 289437a..4c24638 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -115,8 +115,8 @@
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/interstitial_page.h"
-#include "content/common/common_param_traits.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/common/common_param_traits.h"
 #include "net/base/cookie_store.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "ui/base/events.h"
diff --git a/chrome/browser/importer/profile_import_process_messages.h b/chrome/browser/importer/profile_import_process_messages.h
index 1155e97..a2ae0491 100644
--- a/chrome/browser/importer/profile_import_process_messages.h
+++ b/chrome/browser/importer/profile_import_process_messages.h
@@ -13,8 +13,8 @@
 #include "chrome/browser/importer/importer_data_types.h"
 #include "chrome/browser/importer/profile_writer.h"
 #include "chrome/browser/search_engines/template_url.h"
-#include "content/common/common_param_traits.h"
-#include "content/common/webkit_param_traits.h"
+#include "content/public/common/common_param_traits.h"
+#include "content/public/common/webkit_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 #include "webkit/glue/password_form.h"
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index e67806b..34cf4de 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -72,6 +72,7 @@
         'common/chrome_content_client.h',
         'common/chrome_notification_types.h',
         'common/chrome_plugin_messages.h',
+        'common/chrome_utility_messages.h',
         'common/chrome_version_info.cc',
         'common/chrome_version_info_linux.cc',
         'common/chrome_version_info_mac.mm',
diff --git a/chrome/common/autofill_messages.h b/chrome/common/autofill_messages.h
index 213f081..3bccb6d 100644
--- a/chrome/common/autofill_messages.h
+++ b/chrome/common/autofill_messages.h
@@ -7,7 +7,7 @@
 #include <string>
 
 #include "base/time.h"
-#include "content/common/webkit_param_traits.h"
+#include "content/public/common/webkit_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 #include "webkit/glue/form_data.h"
diff --git a/chrome/common/automation_messages.h b/chrome/common/automation_messages.h
index 3b73501..e14749b 100644
--- a/chrome/common/automation_messages.h
+++ b/chrome/common/automation_messages.h
@@ -10,10 +10,10 @@
 #include "base/memory/ref_counted.h"
 #include "chrome/common/automation_constants.h"
 #include "chrome/common/content_settings.h"
-#include "content/common/common_param_traits.h"
-#include "content/common/webkit_param_traits.h"
+#include "content/public/common/common_param_traits.h"
 #include "content/public/common/page_type.h"
 #include "content/public/common/security_style.h"
+#include "content/public/common/webkit_param_traits.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
diff --git a/chrome/common/chrome_utility_messages.h b/chrome/common/chrome_utility_messages.h
index 9e51281..07778f5 100644
--- a/chrome/common/chrome_utility_messages.h
+++ b/chrome/common/chrome_utility_messages.h
@@ -12,8 +12,8 @@
 #include "base/platform_file.h"
 #include "base/values.h"
 #include "chrome/common/extensions/update_manifest.h"
-#include "content/common/common_param_traits.h"
 #include "content/common/serialized_script_value.h"
+#include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "printing/backend/print_backend.h"
 #include "printing/page_range.h"
diff --git a/chrome/common/common_param_traits_unittest.cc b/chrome/common/common_param_traits_unittest.cc
index bc47418..26f7eb6 100644
--- a/chrome/common/common_param_traits_unittest.cc
+++ b/chrome/common/common_param_traits_unittest.cc
@@ -7,7 +7,7 @@
 
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
-#include "content/common/common_param_traits.h"
+#include "content/public/common/common_param_traits.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_utils.h"
diff --git a/chrome/common/extensions/extension_messages.cc b/chrome/common/extensions/extension_messages.cc
index c4913640..617ed64 100644
--- a/chrome/common/extensions/extension_messages.cc
+++ b/chrome/common/extensions/extension_messages.cc
@@ -5,7 +5,7 @@
 #include "chrome/common/extensions/extension_messages.h"
 
 #include "chrome/common/extensions/extension_constants.h"
-#include "content/common/common_param_traits.h"
+#include "content/public/common/common_param_traits.h"
 
 ExtensionMsg_Loaded_Params::ExtensionMsg_Loaded_Params()
     : location(Extension::INVALID),
diff --git a/chrome/common/extensions/extension_unpacker.cc b/chrome/common/extensions/extension_unpacker.cc
index 694cf73..3b706fd 100644
--- a/chrome/common/extensions/extension_unpacker.cc
+++ b/chrome/common/extensions/extension_unpacker.cc
@@ -20,7 +20,7 @@
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/zip.h"
-#include "content/common/common_param_traits.h"
+#include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_message_utils.h"
 #include "net/base/file_stream.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index ff8d403..b7af0d1 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -23,8 +23,8 @@
 #include "chrome/common/search_provider.h"
 #include "chrome/common/thumbnail_score.h"
 #include "chrome/common/translate_errors.h"
-#include "content/common/common_param_traits.h"
-#include "content/common/webkit_param_traits.h"
+#include "content/public/common/common_param_traits.h"
+#include "content/public/common/webkit_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_platform_file.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/content/common/clipboard_messages.h b/content/common/clipboard_messages.h
index c0f7d60..72a15f3 100644
--- a/content/common/clipboard_messages.h
+++ b/content/common/clipboard_messages.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/shared_memory.h"
-#include "content/common/common_param_traits.h"
+#include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
 #include "ui/base/clipboard/clipboard.h"
diff --git a/content/common/dom_storage_messages.h b/content/common/dom_storage_messages.h
index 165e96b..a284ac0 100644
--- a/content/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 "content/common/common_param_traits.h"
+#include "content/public/common/common_param_traits.h"
 #include "googleurl/src/gurl.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
diff --git a/content/common/drag_messages.h b/content/common/drag_messages.h
index a8ac21f..f4e1cd7 100644
--- a/content/common/drag_messages.h
+++ b/content/common/drag_messages.h
@@ -5,7 +5,7 @@
 // IPC messages for drag and drop.
 // Multiply-included message file, hence no include guard.
 
-#include "content/common/common_param_traits.h"
+#include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h"
diff --git a/content/common/file_utilities_messages.h b/content/common/file_utilities_messages.h
index f19325f..08ceced 100644
--- a/content/common/file_utilities_messages.h
+++ b/content/common/file_utilities_messages.h
@@ -5,7 +5,7 @@
 // Multiply-included message file, so no include guard.
 
 #include "base/time.h"
-#include "content/common/common_param_traits.h"
+#include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
 #include "ipc/ipc_platform_file.h"
diff --git a/content/common/gpu/gpu_messages.h b/content/common/gpu/gpu_messages.h
index c9ffc4c..906a195 100644
--- a/content/common/gpu/gpu_messages.h
+++ b/content/common/gpu/gpu_messages.h
@@ -9,8 +9,8 @@
 #include <string>
 
 #include "base/shared_memory.h"
-#include "content/common/common_param_traits.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
+#include "content/public/common/common_param_traits.h"
 #include "content/public/common/gpu_info.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "gpu/command_buffer/common/constants.h"
diff --git a/content/common/java_bridge_messages.h b/content/common/java_bridge_messages.h
index 8dd2353..4329f71 100644
--- a/content/common/java_bridge_messages.h
+++ b/content/common/java_bridge_messages.h
@@ -6,7 +6,7 @@
 
 // Multiply-included message file, hence no include guard.
 
-#include "content/common/webkit_param_traits.h" // For NPVariant_Param
+#include "content/public/common/webkit_param_traits.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message_macros.h"
 
diff --git a/content/common/mac/attributed_string_coder.mm b/content/common/mac/attributed_string_coder.mm
index ca4847d..706368d 100644
--- a/content/common/mac/attributed_string_coder.mm
+++ b/content/common/mac/attributed_string_coder.mm
@@ -10,8 +10,8 @@
 #include "base/memory/scoped_nsobject.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "content/common/common_param_traits.h"
 #include "content/common/view_messages.h"
+#include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_message_utils.h"
 
 namespace mac {
diff --git a/content/common/media/video_capture_messages.h b/content/common/media/video_capture_messages.h
index 0a5e0e7..0112d85 100644
--- a/content/common/media/video_capture_messages.h
+++ b/content/common/media/video_capture_messages.h
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "base/shared_memory.h"
-#include "content/common/common_param_traits.h"
+#include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "media/video/capture/video_capture.h"
 
diff --git a/content/common/mime_registry_messages.h b/content/common/mime_registry_messages.h
index 0fd47bd..559f0ac 100644
--- a/content/common/mime_registry_messages.h
+++ b/content/common/mime_registry_messages.h
@@ -5,7 +5,7 @@
 // Multiply-included message file, so no include guard.
 
 #include "base/file_path.h"
-#include "content/common/common_param_traits.h"
+#include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
 
diff --git a/content/common/pepper_file_messages.h b/content/common/pepper_file_messages.h
index 1bcafa1..941824d 100644
--- a/content/common/pepper_file_messages.h
+++ b/content/common/pepper_file_messages.h
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 // Multiply-included message file, no traditional include guard.
-#include "content/common/common_param_traits.h"
+#include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
 #include "ipc/ipc_platform_file.h"
diff --git a/content/common/plugin_messages.h b/content/common/plugin_messages.h
index 8b57345..d5f073c 100644
--- a/content/common/plugin_messages.h
+++ b/content/common/plugin_messages.h
@@ -5,9 +5,9 @@
 // Multiply-included message file, hence no include guard.
 
 #include "build/build_config.h"
-#include "content/common/common_param_traits.h"
 #include "content/common/content_export.h"
-#include "content/common/webkit_param_traits.h"
+#include "content/public/common/common_param_traits.h"
+#include "content/public/common/webkit_param_traits.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message_macros.h"
 #include "ui/gfx/native_widget_types.h"
diff --git a/content/common/resource_messages.h b/content/common/resource_messages.h
index c37bb69..b132a13e 100644
--- a/content/common/resource_messages.h
+++ b/content/common/resource_messages.h
@@ -6,8 +6,8 @@
 
 // Multiply-included message file, hence no include guard.
 #include "base/shared_memory.h"
-#include "content/common/common_param_traits.h"
 #include "content/common/resource_response.h"
+#include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "net/base/upload_data.h"
 
diff --git a/content/common/utility_messages.h b/content/common/utility_messages.h
index 2cee196..05dcde5 100644
--- a/content/common/utility_messages.h
+++ b/content/common/utility_messages.h
@@ -8,10 +8,10 @@
 #include <vector>
 
 #include "base/basictypes.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 "content/public/common/common_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "webkit/plugins/webplugininfo.h"
 
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index c73c1a7..d7571bd 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -7,7 +7,6 @@
 
 #include "base/process.h"
 #include "base/shared_memory.h"
-#include "content/common/common_param_traits.h"
 #include "content/common/content_export.h"
 #include "content/common/css_colors.h"
 #include "content/common/edit_command.h"
@@ -15,7 +14,8 @@
 #include "content/common/page_zoom.h"
 #include "content/common/renderer_preferences.h"
 #include "content/common/view_message_enums.h"
-#include "content/common/webkit_param_traits.h"
+#include "content/public/common/common_param_traits.h"
+#include "content/public/common/webkit_param_traits.h"
 #include "content/public/common/window_container_type.h"
 #include "ipc/ipc_channel_handle.h"
 #include "ipc/ipc_message_macros.h"
diff --git a/content/common/webblob_messages.h b/content/common/webblob_messages.h
index 6fcd61f..7715454 100644
--- a/content/common/webblob_messages.h
+++ b/content/common/webblob_messages.h
@@ -5,8 +5,8 @@
 // IPC messages for HTML5 Blob.
 // Multiply-included message file, hence no include guard.
 
-#include "content/common/common_param_traits.h"
-#include "content/common/webkit_param_traits.h"
+#include "content/public/common/common_param_traits.h"
+#include "content/public/common/webkit_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 
 #define IPC_MESSAGE_START BlobMsgStart
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 90b9c60..1a622d3 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -70,8 +70,6 @@
     'common/cloud_print_class_mac.h',
     'common/cloud_print_class_mac.mm',
     'common/clipboard_messages.h',
-    'common/common_param_traits.cc',
-    'common/common_param_traits.h',
     'common/content_message_generator.cc',
     'common/content_message_generator.h',
     'common/content_export.h',
@@ -242,15 +240,17 @@
     'common/webblobregistry_impl.cc',
     'common/webblobregistry_impl.h',
     'common/webblob_messages.h',
-    'common/webkit_param_traits.cc',
-    'common/webkit_param_traits.h',
     'common/webmessageportchannel_impl.cc',
     'common/webmessageportchannel_impl.h',
     'common/worker_messages.h',
+    'public/common/common_param_traits.cc',
+    'public/common/common_param_traits.h',
     'public/common/content_client.cc',
     'public/common/content_client.h',
     'public/common/window_container_type.cc',
     'public/common/window_container_type.h',
+    'public/common/webkit_param_traits.cc',
+    'public/common/webkit_param_traits.h',
   ],
   'conditions': [
     ['OS!="win"', {
diff --git a/content/common/common_param_traits.cc b/content/public/common/common_param_traits.cc
index c630105..9d048e9 100644
--- a/content/common/common_param_traits.cc
+++ b/content/public/common/common_param_traits.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/common/common_param_traits.h"
+#include "content/public/common/common_param_traits.h"
 
 #include "content/common/content_constants.h"
 #include "net/base/host_port_pair.h"
diff --git a/content/common/common_param_traits.h b/content/public/common/common_param_traits.h
index 1357497..ff60267 100644
--- a/content/common/common_param_traits.h
+++ b/content/public/common/common_param_traits.h
@@ -10,8 +10,8 @@
 // manual serialization code.  This is usually because they're not structs with
 // public members..
 
-#ifndef CONTENT_COMMON_COMMON_PARAM_TRAITS_H_
-#define CONTENT_COMMON_COMMON_PARAM_TRAITS_H_
+#ifndef CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_H_
+#define CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
@@ -244,4 +244,4 @@ struct SimilarTypeTraits<content::PageTransition> {
 
 }  // namespace IPC
 
-#endif  // CONTENT_COMMON_COMMON_PARAM_TRAITS_H_
+#endif  // CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_H_
diff --git a/content/common/webkit_param_traits.cc b/content/public/common/webkit_param_traits.cc
index a10eaa8..45807a0 100644
--- a/content/common/webkit_param_traits.cc
+++ b/content/public/common/webkit_param_traits.cc
@@ -5,11 +5,11 @@
 // NOTE: New trait definitions that will be used by Chrome Frame must be placed
 // in common_param_traits2.cc.
 
-#include "content/common/webkit_param_traits.h"
+#include "content/public/common/webkit_param_traits.h"
 
 #include "base/string_number_conversions.h"
-#include "content/common/common_param_traits.h"
 #include "content/common/content_constants.h"
+#include "content/public/common/common_param_traits.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
 #include "webkit/glue/password_form.h"
 #include "webkit/glue/resource_loader_bridge.h"
diff --git a/content/common/webkit_param_traits.h b/content/public/common/webkit_param_traits.h
index 8bf9973..d54476a 100644
--- a/content/common/webkit_param_traits.h
+++ b/content/public/common/webkit_param_traits.h
@@ -10,8 +10,8 @@
 // manual serialization code.  This is usually because they're not structs with
 // public members.
 
-#ifndef CONTENT_COMMON_WEBKIT_PARAM_TRAITS_H_
-#define CONTENT_COMMON_WEBKIT_PARAM_TRAITS_H_
+#ifndef CONTENT_PUBLIC_COMMON_WEBKIT_PARAM_TRAITS_H_
+#define CONTENT_PUBLIC_COMMON_WEBKIT_PARAM_TRAITS_H_
 #pragma once
 
 #include <string>
@@ -246,4 +246,4 @@ struct CONTENT_EXPORT ParamTraits<webkit_glue::PasswordForm> {
 
 }  // namespace IPC
 
-#endif  // CONTENT_COMMON_WEBKIT_PARAM_TRAITS_H_
+#endif  // CONTENT_PUBLIC_COMMON_WEBKIT_PARAM_TRAITS_H_
diff --git a/content/renderer/java_bridge_dispatcher.h b/content/renderer/java_bridge_dispatcher.h
index bc73f0c..7860c72 100644
--- a/content/renderer/java_bridge_dispatcher.h
+++ b/content/renderer/java_bridge_dispatcher.h
@@ -5,7 +5,7 @@
 #ifndef CONTENT_RENDERER_JAVA_BRIDGE_DISPATCHER_H_
 #define CONTENT_RENDERER_JAVA_BRIDGE_DISPATCHER_H_
 
-#include "content/common/webkit_param_traits.h"  // For NPVariant_Param
+#include "content/public/common/webkit_param_traits.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "ipc/ipc_channel_handle.h"