Move forms/ out of webkit/.

chrome/browser/autofill/autofill_manager_unittest.cc

Index: chrome/browser/autofill/autofill_manager_unittest.cc
diff --git a/chrome/browser/autofill/autofill_manager_unittest.cc b/chrome/browser/autofill/autofill_manager_unittest.cc
index 8395a1226aaad1e7d5e56ef211412187fe46d775..04d2d3243a48814c0e11740769cdc15e490a87fe 100644
--- a/chrome/browser/autofill/autofill_manager_unittest.cc
+++ b/chrome/browser/autofill/autofill_manager_unittest.cc
@@ -35,6 +35,8 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/form_data.h"
+#include "content/public/common/form_field.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
@@ -45,14 +47,12 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/rect.h"
-#include "webkit/forms/form_data.h"
-#include "webkit/forms/form_field.h"
 
 using content::BrowserThread;
+using content::FormData;
+using content::FormField;
 using content::WebContents;
 using testing::_;
-using webkit::forms::FormData;
-using webkit::forms::FormField;
 
 namespace {
 
@@ -301,7 +301,7 @@ void ExpectFilledField(const char* expected_label,
                        const char* expected_name,
                        const char* expected_value,
                        const char* expected_form_control_type,
-                       const webkit::forms::FormField& field) {
+                       const content::FormField& field) {
   SCOPED_TRACE(expected_label);
   EXPECT_EQ(UTF8ToUTF16(expected_label), field.label);
   EXPECT_EQ(UTF8ToUTF16(expected_name), field.name);
@@ -623,8 +623,8 @@ class AutofillManagerTest : public TabContentsTestHarness {
   }
 
   void GetAutofillSuggestions(int query_id,
-                              const webkit::forms::FormData& form,
-                              const webkit::forms::FormField& field) {
+                              const content::FormData& form,
+                              const content::FormField& field) {
     autofill_manager_->OnQueryFormFieldAutofill(query_id,
                                                 form,
                                                 field,
@@ -632,8 +632,8 @@ class AutofillManagerTest : public TabContentsTestHarness {
                                                 false);
   }
 
-  void GetAutofillSuggestions(const webkit::forms::FormData& form,
-                              const webkit::forms::FormField& field) {
+  void GetAutofillSuggestions(const content::FormData& form,
+                              const content::FormField& field) {
     GetAutofillSuggestions(kDefaultPageID, form, field);
   }
 
@@ -642,7 +642,7 @@ class AutofillManagerTest : public TabContentsTestHarness {
         SendSuggestions(&result);
   }
 
-  void FormsSeen(const std::vector<webkit::forms::FormData>& forms) {
+  void FormsSeen(const std::vector<content::FormData>& forms) {
     autofill_manager_->OnFormsSeen(forms, base::TimeTicks());
   }
 
@@ -652,8 +652,8 @@ class AutofillManagerTest : public TabContentsTestHarness {
   }
 
   void FillAutofillFormData(int query_id,
-                            const webkit::forms::FormData& form,
-                            const webkit::forms::FormField& field,
+                            const content::FormData& form,
+                            const content::FormField& field,
                             int unique_id) {
     autofill_manager_->OnFillAutofillFormData(query_id, form, field, unique_id);
   }
@@ -3082,14 +3082,14 @@ class MockAutofillExternalDelegate : public TestAutofillExternalDelegate {
   virtual ~MockAutofillExternalDelegate() {}
 
   MOCK_METHOD5(OnQuery, void(int query_id,
-                             const webkit::forms::FormData& form,
-                             const webkit::forms::FormField& field,
+                             const content::FormData& form,
+                             const content::FormField& field,
                              const gfx::Rect& bounds,
                              bool display_warning));
 
   virtual void OnQueryPlatformSpecific(int query_id,
-                                       const webkit::forms::FormData& form,
-                                       const webkit::forms::FormField& field,
+                                       const content::FormData& form,
+                                       const content::FormField& field,
                                        const gfx::Rect& bounds) OVERRIDE {}
 
  private: