Group forms-related files in webkit/glue in a forms/ subdirectory.

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 a3ad503f4fcd68a9d5d3571ccd4b3c1d534ce5ab..22abbf0cab84a4540bf3bf441b8802321ab1cbe6 100644
--- a/chrome/browser/autofill/autofill_manager_unittest.cc
+++ b/chrome/browser/autofill/autofill_manager_unittest.cc
@@ -39,13 +39,13 @@
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/rect.h"
-#include "webkit/glue/form_data.h"
-#include "webkit/glue/form_field.h"
+#include "webkit/forms/form_data.h"
+#include "webkit/forms/form_field.h"
 
 using content::BrowserThread;
 using testing::_;
-using webkit_glue::FormData;
-using webkit_glue::FormField;
+using webkit::forms::FormData;
+using webkit::forms::FormField;
 
 namespace {
 
@@ -269,7 +269,7 @@ void ExpectFilledField(const char* expected_label,
                        const char* expected_name,
                        const char* expected_value,
                        const char* expected_form_control_type,
-                       const webkit_glue::FormField& field) {
+                       const webkit::forms::FormField& field) {
   SCOPED_TRACE(expected_label);
   EXPECT_EQ(UTF8ToUTF16(expected_label), field.label);
   EXPECT_EQ(UTF8ToUTF16(expected_name), field.name);
@@ -566,8 +566,8 @@ class AutofillManagerTest : public TabContentsWrapperTestHarness {
   }
 
   void GetAutofillSuggestions(int query_id,
-                              const webkit_glue::FormData& form,
-                              const webkit_glue::FormField& field) {
+                              const webkit::forms::FormData& form,
+                              const webkit::forms::FormField& field) {
     autofill_manager_->OnQueryFormFieldAutofill(query_id,
                                                 form,
                                                 field,
@@ -575,8 +575,8 @@ class AutofillManagerTest : public TabContentsWrapperTestHarness {
                                                 false);
   }
 
-  void GetAutofillSuggestions(const webkit_glue::FormData& form,
-                              const webkit_glue::FormField& field) {
+  void GetAutofillSuggestions(const webkit::forms::FormData& form,
+                              const webkit::forms::FormField& field) {
     GetAutofillSuggestions(kDefaultPageID, form, field);
   }
 
@@ -585,7 +585,7 @@ class AutofillManagerTest : public TabContentsWrapperTestHarness {
         SendSuggestions(&result);
   }
 
-  void FormsSeen(const std::vector<webkit_glue::FormData>& forms) {
+  void FormsSeen(const std::vector<webkit::forms::FormData>& forms) {
     autofill_manager_->OnFormsSeen(forms, base::TimeTicks());
   }
 
@@ -595,8 +595,8 @@ class AutofillManagerTest : public TabContentsWrapperTestHarness {
   }
 
   void FillAutofillFormData(int query_id,
-                            const webkit_glue::FormData& form,
-                            const webkit_glue::FormField& field,
+                            const webkit::forms::FormData& form,
+                            const webkit::forms::FormField& field,
                             int unique_id) {
     autofill_manager_->OnFillAutofillFormData(query_id, form, field, unique_id);
   }
@@ -2869,8 +2869,8 @@ class MockAutofillExternalDelegate : public AutofillExternalDelegate {
   virtual ~MockAutofillExternalDelegate() {}
 
   MOCK_METHOD5(OnQuery, void(int query_id,
-                             const webkit_glue::FormData& form,
-                             const webkit_glue::FormField& field,
+                             const webkit::forms::FormData& form,
+                             const webkit::forms::FormField& field,
                              const gfx::Rect& bounds,
                              bool display_warning));
 
@@ -2885,8 +2885,8 @@ class MockAutofillExternalDelegate : public AutofillExternalDelegate {
 
   virtual void OnQueryPlatformSpecific(
       int query_id,
-      const webkit_glue::FormData& form,
-      const webkit_glue::FormField& field) OVERRIDE {}
+      const webkit::forms::FormData& form,
+      const webkit::forms::FormField& field) OVERRIDE {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAutofillExternalDelegate);