Cleanup the IPC param traits structure

content/public/common/common_param_traits_macros.h

Index: content/public/common/common_param_traits_macros.h
===================================================================
--- content/public/common/common_param_traits_macros.h	(revision 158377)
+++ content/public/common/common_param_traits_macros.h	(working copy)
@@ -9,19 +9,66 @@
 #define CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_
 
 #include "content/public/common/console_message_level.h"
-#include "content/public/common/page_transition_types.h"
 #include "content/public/common/security_style.h"
 #include "ipc/ipc_message_macros.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebPoint.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h"
-#include "webkit/glue/resource_type.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebRect.h"
+#include "webkit/forms/password_form.h"
+#include "webkit/glue/window_open_disposition.h"
+#include "webkit/plugins/webplugininfo.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 
 IPC_ENUM_TRAITS(content::ConsoleMessageLevel)
-IPC_ENUM_TRAITS(content::PageTransition)
 IPC_ENUM_TRAITS(content::SecurityStyle)
-IPC_ENUM_TRAITS(ResourceType::Type)
 IPC_ENUM_TRAITS(WebKit::WebReferrerPolicy)
+IPC_ENUM_TRAITS(WindowOpenDisposition)
 
+IPC_STRUCT_TRAITS_BEGIN(WebKit::WebPoint)
+  IPC_STRUCT_TRAITS_MEMBER(x)
+  IPC_STRUCT_TRAITS_MEMBER(y)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(WebKit::WebRect)
+  IPC_STRUCT_TRAITS_MEMBER(x)
+  IPC_STRUCT_TRAITS_MEMBER(y)
+  IPC_STRUCT_TRAITS_MEMBER(width)
+  IPC_STRUCT_TRAITS_MEMBER(height)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(webkit::forms::PasswordForm)
+IPC_STRUCT_TRAITS_MEMBER(signon_realm)
+IPC_STRUCT_TRAITS_MEMBER(origin)
+IPC_STRUCT_TRAITS_MEMBER(action)
+IPC_STRUCT_TRAITS_MEMBER(submit_element)
+IPC_STRUCT_TRAITS_MEMBER(username_element)
+IPC_STRUCT_TRAITS_MEMBER(username_value)
+IPC_STRUCT_TRAITS_MEMBER(password_element)
+IPC_STRUCT_TRAITS_MEMBER(password_value)
+IPC_STRUCT_TRAITS_MEMBER(old_password_element)
+IPC_STRUCT_TRAITS_MEMBER(old_password_value)
+IPC_STRUCT_TRAITS_MEMBER(ssl_valid)
+IPC_STRUCT_TRAITS_MEMBER(preferred)
+IPC_STRUCT_TRAITS_MEMBER(blacklisted_by_user)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(webkit::WebPluginMimeType)
+  IPC_STRUCT_TRAITS_MEMBER(mime_type)
+  IPC_STRUCT_TRAITS_MEMBER(file_extensions)
+  IPC_STRUCT_TRAITS_MEMBER(description)
+  IPC_STRUCT_TRAITS_MEMBER(additional_param_names)
+  IPC_STRUCT_TRAITS_MEMBER(additional_param_values)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(webkit::WebPluginInfo)
+  IPC_STRUCT_TRAITS_MEMBER(name)
+  IPC_STRUCT_TRAITS_MEMBER(path)
+  IPC_STRUCT_TRAITS_MEMBER(version)
+  IPC_STRUCT_TRAITS_MEMBER(desc)
+  IPC_STRUCT_TRAITS_MEMBER(mime_types)
+  IPC_STRUCT_TRAITS_MEMBER(type)
+IPC_STRUCT_TRAITS_END()
+
 #endif  // CONTENT_PUBLIC_COMMON_COMMON_PARAM_TRAITS_MACROS_H_