Move forms/ out of webkit/.

chrome/browser/autofill/autofill_external_delegate_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/autofill/test_autofill_external_delegate.h"
 #include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h"
 #include "chrome/browser/ui/tab_contents/test_tab_contents.h"
 #include "chrome/test/base/testing_profile.h"
+#include "content/public/common/form_data.h"
+#include "content/public/common/form_field.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebAutofillClient.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 testing::_;
-using webkit::forms::FormData;
-using webkit::forms::FormField;
 using WebKit::WebAutofillClient;
 
 namespace {
 
 // A constant value to use as the Autofill query ID.
 const int kQueryId = 5;
 
 // A constant value to use as an Autofill profile ID.
 const int kAutofillProfileId = 1;
 
 class MockAutofillExternalDelegate : public TestAutofillExternalDelegate {
  public:
   MockAutofillExternalDelegate(TabContents* tab_contents,
                                AutofillManager* autofill_manger)
       : TestAutofillExternalDelegate(tab_contents, autofill_manger) {}
   ~MockAutofillExternalDelegate() {}
 
   MOCK_METHOD4(ApplyAutofillSuggestions, void(
       const std::vector<string16>& autofill_values,
       const std::vector<string16>& autofill_labels,
       const std::vector<string16>& autofill_icons,
       const std::vector<int>& autofill_unique_ids));
 
   MOCK_METHOD4(OnQueryPlatformSpecific,
                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));
 
   MOCK_METHOD0(ClearPreviewedForm, void());
 
   MOCK_METHOD0(HideAutofillPopup, void());
 
  private:
   virtual void HideAutofillPopupInternal() {};
 };
 
 class MockAutofillManager : public AutofillManager {
  public:
   explicit MockAutofillManager(autofill::AutofillManagerDelegate* delegate,
                                TabContents* tab_contents)
       // Force to use the constructor designated for unit test, but we don't
       // really need personal_data in this test so we pass a NULL pointer.
       : AutofillManager(delegate, tab_contents, NULL) {
   }
 
   MOCK_METHOD4(OnFillAutofillFormData,
                void(int query_id,
-                    const webkit::forms::FormData& form,
-                    const webkit::forms::FormField& field,
+                    const content::FormData& form,
+                    const content::FormField& field,
                     int unique_id));
 
  protected:
   virtual ~MockAutofillManager() {}
 };
 
 }  // namespace
 
 class AutofillExternalDelegateUnitTest : public TabContentsTestHarness {
  public:
@@ skipping 158 matching lines @@
   external_delegate_->SelectAutofillSuggestionAtIndex(1);
 }
 
 // Test that the popup is hidden once we are done editing the autofill field.
 TEST_F(AutofillExternalDelegateUnitTest,
        ExternalDelegateHidePopupAfterEditing) {
   EXPECT_CALL(*external_delegate_, HideAutofillPopup());
 
   external_delegate_->DidEndTextFieldEditing();
 }