Move PasswordForm from //content to //autofill.

components/autofill/core/common/autofill_messages.h

Index: components/autofill/core/common/autofill_messages.h
diff --git a/components/autofill/core/common/autofill_messages.h b/components/autofill/core/common/autofill_messages.h
index 9e669b14c2e4edb7084275e9f4ee30ddd24aebb3..807a59732190608e5db75fb58eaaa6dfd24182ac 100644
--- a/components/autofill/core/common/autofill_messages.h
+++ b/components/autofill/core/common/autofill_messages.h
@@ -7,16 +7,17 @@
 #include <string>
 
 #include "base/time/time.h"
+#include "components/autofill/core/common/autofill_param_traits_macros.h"
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_data_predictions.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/autofill/core/common/form_field_data_predictions.h"
 #include "components/autofill/core/common/forms_seen_state.h"
+#include "components/autofill/core/common/password_form.h"
 #include "components/autofill/core/common/password_form_fill_data.h"
 #include "components/autofill/core/common/web_element_descriptor.h"
 #include "content/public/common/common_param_traits.h"
 #include "content/public/common/common_param_traits_macros.h"
-#include "content/public/common/password_form.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_message_utils.h"
 #include "third_party/WebKit/public/web/WebFormElement.h"
@@ -25,82 +26,6 @@
 
 #define IPC_MESSAGE_START AutofillMsgStart
 
-IPC_ENUM_TRAITS_MAX_VALUE(autofill::FormsSeenState,
-                          autofill::FORMS_SEEN_STATE_NUM_STATES - 1)
-IPC_ENUM_TRAITS_MAX_VALUE(base::i18n::TextDirection,
-                          base::i18n::TEXT_DIRECTION_NUM_DIRECTIONS - 1)
-
-IPC_STRUCT_TRAITS_BEGIN(autofill::WebElementDescriptor)
-  IPC_STRUCT_TRAITS_MEMBER(descriptor)
-  IPC_STRUCT_TRAITS_MEMBER(retrieval_method)
-IPC_STRUCT_TRAITS_END()
-
-IPC_ENUM_TRAITS_MAX_VALUE(autofill::WebElementDescriptor::RetrievalMethod,
-                          autofill::WebElementDescriptor::NONE)
-
-IPC_STRUCT_TRAITS_BEGIN(autofill::FormFieldData)
-  IPC_STRUCT_TRAITS_MEMBER(label)
-  IPC_STRUCT_TRAITS_MEMBER(name)
-  IPC_STRUCT_TRAITS_MEMBER(value)
-  IPC_STRUCT_TRAITS_MEMBER(form_control_type)
-  IPC_STRUCT_TRAITS_MEMBER(autocomplete_attribute)
-  IPC_STRUCT_TRAITS_MEMBER(max_length)
-  IPC_STRUCT_TRAITS_MEMBER(is_autofilled)
-  IPC_STRUCT_TRAITS_MEMBER(is_checked)
-  IPC_STRUCT_TRAITS_MEMBER(is_checkable)
-  IPC_STRUCT_TRAITS_MEMBER(is_focusable)
-  IPC_STRUCT_TRAITS_MEMBER(should_autocomplete)
-  IPC_STRUCT_TRAITS_MEMBER(text_direction)
-  IPC_STRUCT_TRAITS_MEMBER(option_values)
-  IPC_STRUCT_TRAITS_MEMBER(option_contents)
-IPC_STRUCT_TRAITS_END()
-
-IPC_STRUCT_TRAITS_BEGIN(autofill::FormFieldDataPredictions)
-  IPC_STRUCT_TRAITS_MEMBER(field)
-  IPC_STRUCT_TRAITS_MEMBER(signature)
-  IPC_STRUCT_TRAITS_MEMBER(heuristic_type)
-  IPC_STRUCT_TRAITS_MEMBER(server_type)
-  IPC_STRUCT_TRAITS_MEMBER(overall_type)
-IPC_STRUCT_TRAITS_END()
-
-IPC_STRUCT_TRAITS_BEGIN(autofill::FormData)
-  IPC_STRUCT_TRAITS_MEMBER(name)
-  IPC_STRUCT_TRAITS_MEMBER(method)
-  IPC_STRUCT_TRAITS_MEMBER(origin)
-  IPC_STRUCT_TRAITS_MEMBER(action)
-  IPC_STRUCT_TRAITS_MEMBER(user_submitted)
-  IPC_STRUCT_TRAITS_MEMBER(fields)
-IPC_STRUCT_TRAITS_END()
-
-IPC_STRUCT_TRAITS_BEGIN(autofill::FormDataPredictions)
-  IPC_STRUCT_TRAITS_MEMBER(data)
-  IPC_STRUCT_TRAITS_MEMBER(signature)
-  IPC_STRUCT_TRAITS_MEMBER(experiment_id)
-  IPC_STRUCT_TRAITS_MEMBER(fields)
-IPC_STRUCT_TRAITS_END()
-
-IPC_STRUCT_TRAITS_BEGIN(autofill::UsernamesCollectionKey)
-  IPC_STRUCT_TRAITS_MEMBER(username)
-  IPC_STRUCT_TRAITS_MEMBER(password)
-IPC_STRUCT_TRAITS_END()
-
-IPC_STRUCT_TRAITS_BEGIN(autofill::PasswordFormFillData)
-  IPC_STRUCT_TRAITS_MEMBER(basic_data)
-  IPC_STRUCT_TRAITS_MEMBER(preferred_realm)
-  IPC_STRUCT_TRAITS_MEMBER(additional_logins)
-  IPC_STRUCT_TRAITS_MEMBER(other_possible_usernames)
-  IPC_STRUCT_TRAITS_MEMBER(wait_for_username)
-IPC_STRUCT_TRAITS_END()
-
-IPC_STRUCT_TRAITS_BEGIN(autofill::PasswordAndRealm)
-  IPC_STRUCT_TRAITS_MEMBER(password)
-  IPC_STRUCT_TRAITS_MEMBER(realm)
-IPC_STRUCT_TRAITS_END()
-
-IPC_ENUM_TRAITS_MAX_VALUE(
-    WebKit::WebFormElement::AutocompleteResult,
-    WebKit::WebFormElement::AutocompleteResultErrorInvalid)
-
 // Autofill messages sent from the browser to the renderer.
 
 // Reply to the AutofillHostMsg_FillAutofillFormData message with the
@@ -156,7 +81,7 @@ IPC_MESSAGE_ROUTED1(AutofillMsg_AcceptPasswordAutofillSuggestion,
 // Tells the renderer that this password form is not blacklisted.  A form can
 // be blacklisted if a user chooses "never save passwords for this site".
 IPC_MESSAGE_ROUTED1(AutofillMsg_FormNotBlacklisted,
-                    content::PasswordForm /* form checked */)
+                    autofill::PasswordForm /* form checked */)
 
 // Sent when requestAutocomplete() finishes (either succesfully or with an
 // error). If it was a success, the renderer fills the form that requested
@@ -184,16 +109,16 @@ IPC_MESSAGE_ROUTED3(AutofillHostMsg_FormsSeen,
 // Notification that password forms have been seen that are candidates for
 // filling/submitting by the password manager.
 IPC_MESSAGE_ROUTED1(AutofillHostMsg_PasswordFormsParsed,
-                    std::vector<content::PasswordForm> /* forms */)
+                    std::vector<autofill::PasswordForm> /* forms */)
 
 // Notification that initial layout has occurred and the following password
 // forms are visible on the page (e.g. not set to display:none.)
 IPC_MESSAGE_ROUTED1(AutofillHostMsg_PasswordFormsRendered,
-                    std::vector<content::PasswordForm> /* forms */)
+                    std::vector<autofill::PasswordForm> /* forms */)
 
 // Notification that this password form was submitted by the user.
 IPC_MESSAGE_ROUTED1(AutofillHostMsg_PasswordFormSubmitted,
-                    content::PasswordForm /* form */)
+                    autofill::PasswordForm /* form */)
 
 // Notification that a form has been submitted.  The user hit the button.
 IPC_MESSAGE_ROUTED2(AutofillHostMsg_FormSubmitted,
@@ -249,7 +174,7 @@ IPC_MESSAGE_ROUTED0(AutofillHostMsg_HideAutofillUI)
 IPC_MESSAGE_ROUTED3(AutofillHostMsg_ShowPasswordGenerationPopup,
                     gfx::Rect /* source location */,
                     int /* max length of the password */,
-                    content::PasswordForm)
+                    autofill::PasswordForm)
 
 // Instruct the browser that a password mapping has been found for a field.
 IPC_MESSAGE_ROUTED2(AutofillHostMsg_AddPasswordFormMapping,