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

chrome/browser/webdata/web_data_service_unittest.cc

Index: chrome/browser/webdata/web_data_service_unittest.cc
diff --git a/chrome/browser/webdata/web_data_service_unittest.cc b/chrome/browser/webdata/web_data_service_unittest.cc
index 8006e8a6a9b86db660b7f5743567c3d05b95dfab..a6e4891ab6ae81f8c159a4c65304f689154949be 100644
--- a/chrome/browser/webdata/web_data_service_unittest.cc
+++ b/chrome/browser/webdata/web_data_service_unittest.cc
@@ -33,7 +33,7 @@
 #include "content/test/test_browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "webkit/glue/form_field.h"
+#include "webkit/forms/form_field.h"
 
 using base::Time;
 using base::TimeDelta;
@@ -129,8 +129,8 @@ class WebDataServiceAutofillTest : public WebDataServiceTest {
 
   void AppendFormField(const string16& name,
                        const string16& value,
-                       std::vector<webkit_glue::FormField>* form_fields) {
-    webkit_glue::FormField field;
+                       std::vector<webkit::forms::FormField>* form_fields) {
+    webkit::forms::FormField field;
     field.name = name;
     field.value = value;
     form_fields->push_back(field);
@@ -224,7 +224,7 @@ TEST_F(WebDataServiceAutofillTest, FormFillAdd) {
                        Pointee(ElementsAreArray(expected_changes))))).
       WillOnce(SignalEvent(&done_event_));
 
-  std::vector<webkit_glue::FormField> form_fields;
+  std::vector<webkit::forms::FormField> form_fields;
   AppendFormField(name1_, value1_, &form_fields);
   AppendFormField(name2_, value2_, &form_fields);
   wds_->AddFormFields(form_fields);
@@ -250,7 +250,7 @@ TEST_F(WebDataServiceAutofillTest, FormFillRemoveOne) {
   // First add some values to autofill.
   EXPECT_CALL(*observer_helper_->observer(), Observe(_, _, _)).
       WillOnce(SignalEvent(&done_event_));
-  std::vector<webkit_glue::FormField> form_fields;
+  std::vector<webkit::forms::FormField> form_fields;
   AppendFormField(name1_, value1_, &form_fields);
   wds_->AddFormFields(form_fields);
 
@@ -281,7 +281,7 @@ TEST_F(WebDataServiceAutofillTest, FormFillRemoveMany) {
 
   EXPECT_CALL(*observer_helper_->observer(), Observe(_, _, _)).
       WillOnce(SignalEvent(&done_event_));
-  std::vector<webkit_glue::FormField> form_fields;
+  std::vector<webkit::forms::FormField> form_fields;
   AppendFormField(name1_, value1_, &form_fields);
   AppendFormField(name2_, value2_, &form_fields);
   wds_->AddFormFields(form_fields);