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

chrome/browser/autofill/autofill_common_test.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_AUTOFILL_AUTOFILL_COMMON_TEST_H_
 #define CHROME_BROWSER_AUTOFILL_AUTOFILL_COMMON_TEST_H_
 #pragma once
 
 class AutofillProfile;
 class CreditCard;
 class Profile;
 
-namespace webkit_glue {
+namespace webkit {
+namespace forms {
 struct FormField;
-}  // namespace webkit_glue
+}
+}
 
 // Common utilities shared amongst Autofill tests.
 namespace autofill_test {
 
 // Provides a quick way to populate a FormField with c-strings.
 void CreateTestFormField(const char* label,
                          const char* name,
                          const char* value,
                          const char* type,
-                         webkit_glue::FormField* field);
+                         webkit::forms::FormField* field);
 
 // A unit testing utility that is common to a number of the Autofill unit
 // tests.  |SetProfileInfo| provides a quick way to populate a profile with
 // c-strings.
 void SetProfileInfo(AutofillProfile* profile,
     const char* first_name, const char* middle_name,
     const char* last_name, const char* email, const char* company,
     const char* address1, const char* address2, const char* city,
     const char* state, const char* zipcode, const char* country,
     const char* phone);
@@ skipping 13 matching lines @@
     const char* expiration_month, const char* expiration_year);
 
 // TODO(isherman): We should do this automatically for all tests, not manually
 // on a per-test basis: http://crbug.com/57221
 // Disables or mocks out code that would otherwise reach out to system services.
 void DisableSystemServices(Profile* profile);
 
 }  // namespace autofill_test
 
 #endif  // CHROME_BROWSER_AUTOFILL_AUTOFILL_COMMON_TEST_H_