Move forms/ out of webkit/.

chrome/browser/autofill/autocomplete_history_manager_unittest.cc

Index: chrome/browser/autofill/autocomplete_history_manager_unittest.cc
diff --git a/chrome/browser/autofill/autocomplete_history_manager_unittest.cc b/chrome/browser/autofill/autocomplete_history_manager_unittest.cc
index 16799f9840eb1ed65001248359bb9afd0b1468de..9cc9adef92a178d3d3c0553101718b1293f2277c 100644
--- a/chrome/browser/autofill/autocomplete_history_manager_unittest.cc
+++ b/chrome/browser/autofill/autocomplete_history_manager_unittest.cc
@@ -12,6 +12,7 @@
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/webdata/autofill_web_data_service_impl.h"
 #include "chrome/browser/webdata/web_data_service.h"
+#include "chrome/common/form_data.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
@@ -19,17 +20,15 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/rect.h"
-#include "webkit/forms/form_data.h"
 
 using content::BrowserThread;
 using content::WebContents;
 using testing::_;
-using webkit::forms::FormData;
 
 class MockWebDataService : public WebDataService {
  public:
   MOCK_METHOD1(AddFormFields,
-               void(const std::vector<webkit::forms::FormField>&));  // NOLINT
+               void(const std::vector<FormFieldData>&));  // NOLINT
 
  protected:
   virtual ~MockWebDataService() {}
@@ -71,7 +70,7 @@ TEST_F(AutocompleteHistoryManagerTest, CreditCardNumberValue) {
   form.user_submitted = true;
 
   // Valid Visa credit card number pulled from the paypal help site.
-  webkit::forms::FormField valid_cc;
+  FormFieldData valid_cc;
   valid_cc.label = ASCIIToUTF16("Credit Card");
   valid_cc.name = ASCIIToUTF16("ccnum");
   valid_cc.value = ASCIIToUTF16("4012888888881881");
@@ -94,7 +93,7 @@ TEST_F(AutocompleteHistoryManagerTest, NonCreditCardNumberValue) {
   form.user_submitted = true;
 
   // Invalid credit card number.
-  webkit::forms::FormField invalid_cc;
+  FormFieldData invalid_cc;
   invalid_cc.label = ASCIIToUTF16("Credit Card");
   invalid_cc.name = ASCIIToUTF16("ccnum");
   invalid_cc.value = ASCIIToUTF16("4580123456789012");
@@ -114,7 +113,7 @@ TEST_F(AutocompleteHistoryManagerTest, SSNValue) {
   form.action = GURL("http://myform.com/submit.html");
   form.user_submitted = true;
 
-  webkit::forms::FormField ssn;
+  FormFieldData ssn;
   ssn.label = ASCIIToUTF16("Social Security Number");
   ssn.name = ASCIIToUTF16("ssn");
   ssn.value = ASCIIToUTF16("078-05-1120");
@@ -135,7 +134,7 @@ TEST_F(AutocompleteHistoryManagerTest, SearchField) {
   form.user_submitted = true;
 
   // Search field.
-  webkit::forms::FormField search_field;
+  FormFieldData search_field;
   search_field.label = ASCIIToUTF16("Search");
   search_field.name = ASCIIToUTF16("search");
   search_field.value = ASCIIToUTF16("my favorite query");