Move forms/ out of webkit/.

chrome/browser/ui/views/autofill/autofill_external_delegate_views_browsertest.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 "chrome/browser/ui/views/autofill/autofill_external_delegate_views.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/views/autofill/autofill_popup_view_views.h"
@@ skipping 33 matching lines @@
   virtual void SetUpOnMainThread() OVERRIDE {
     tab_contents_ = chrome::GetActiveTabContents(browser());
     ASSERT_TRUE(tab_contents_ != NULL);
 
     autofill_external_delegate_.reset(
         new MockAutofillExternalDelegateViews(tab_contents_));
   }
 
   void GeneratePopup() {
     int query_id = 1;
-    webkit::forms::FormData form;
-    webkit::forms::FormField field;
+    FormData form;
+    FormFieldData field;
     field.is_focusable = true;
     field.should_autocomplete = true;
     gfx::Rect bounds(100, 100);
 
     // Ensure that we can populate the popup through the delegate without any
     // and then close it.
     autofill_external_delegate_->OnQuery(query_id, form, field, bounds, false);
 
     std::vector<string16> autofill_item;
     autofill_item.push_back(string16());
@@ skipping 21 matching lines @@
   GeneratePopup();
 
   // Delete the widget to ensure that the external delegate can handle the
   // popup getting deleted elsewhere and the .
   views::Widget* popup_widget =
       autofill_external_delegate_->popup_view()->GetWidget();
   popup_widget->CloseNow();
 
   EXPECT_TRUE(autofill_external_delegate_->popup_hidden_);
 }