1 files changed, 12 insertions, 14 deletions

diff --git a/chrome/renderer/autofill/autofill_agent.cc b/chrome/renderer/autofill/autofill_agent.cc
index a86a213..bd574c0 100644
--- a/chrome/renderer/autofill/autofill_agent.cc
+++ b/chrome/renderer/autofill/autofill_agent.cc
@@ -12,8 +12,12 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/common/chrome_constants.h"
+#include "chrome/common/form_data.h"
+#include "chrome/common/form_data_predictions.h"
+#include "chrome/common/form_field_data.h"
 #include "chrome/renderer/autofill/form_autofill_util.h"
 #include "chrome/renderer/autofill/password_autofill_manager.h"
+#include "content/public/common/password_form.h"
 #include "content/public/renderer/render_view.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -28,10 +32,6 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "webkit/forms/form_data.h"
-#include "webkit/forms/form_data_predictions.h"
-#include "webkit/forms/form_field.h"
-#include "webkit/forms/password_form.h"
 
 using WebKit::WebAutofillClient;
 using WebKit::WebFormControlElement;
@@ -43,8 +43,6 @@ using WebKit::WebNode;
 using WebKit::WebNodeCollection;
 using WebKit::WebOptionElement;
 using WebKit::WebString;
-using webkit::forms::FormData;
-using webkit::forms::FormDataPredictions;
 
 namespace {
 
@@ -169,7 +167,7 @@ bool AutofillAgent::OnMessageReceived(const IPC::Message& message) {
 void AutofillAgent::DidFinishDocumentLoad(WebFrame* frame) {
   // The document has now been fully loaded.  Scan for forms to be sent up to
   // the browser.
-  std::vector<webkit::forms::FormData> forms;
+  std::vector<FormData> forms;
   form_cache_.ExtractForms(*frame, &forms);
 
   if (!forms.empty()) {
@@ -334,8 +332,8 @@ void AutofillAgent::TextFieldDidChangeImpl(const WebInputElement& element) {
 
   ShowSuggestions(element, false, true, false);
 
-  webkit::forms::FormData form;
-  webkit::forms::FormField field;
+  FormData form;
+  FormFieldData field;
   if (FindFormAndFieldForInputElement(element, &form, &field, REQUIRE_NONE)) {
     Send(new AutofillHostMsg_TextFieldDidChange(routing_id(), form, field,
                                                 base::TimeTicks::Now()));
@@ -507,7 +505,7 @@ void AutofillAgent::AcceptDataListSuggestion(const string16& suggested_value) {
 }
 
 void AutofillAgent::OnFormDataFilled(int query_id,
-                                     const webkit::forms::FormData& form) {
+                                     const FormData& form) {
   if (!render_view()->GetWebView() || query_id != autofill_query_id_)
     return;
 
@@ -626,8 +624,8 @@ void AutofillAgent::QueryAutofillSuggestions(const WebInputElement& element,
   autofill_query_id_ = query_counter++;
   display_warning_if_disabled_ = display_warning_if_disabled;
 
-  webkit::forms::FormData form;
-  webkit::forms::FormField field;
+  FormData form;
+  FormFieldData field;
   if (!FindFormAndFieldForInputElement(element, &form, &field,
                                        REQUIRE_AUTOCOMPLETE)) {
     // If we didn't find the cached form, at least let autocomplete have a shot
@@ -675,8 +673,8 @@ void AutofillAgent::FillAutofillFormData(const WebNode& node,
   static int query_counter = 0;
   autofill_query_id_ = query_counter++;
 
-  webkit::forms::FormData form;
-  webkit::forms::FormField field;
+  FormData form;
+  FormFieldData field;
   if (!FindFormAndFieldForInputElement(node.toConst<WebInputElement>(), &form,
                                        &field, REQUIRE_AUTOCOMPLETE)) {
     return;