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

chrome/browser/password_manager/password_store_mac_internal.h

Index: chrome/browser/password_manager/password_store_mac_internal.h
diff --git a/chrome/browser/password_manager/password_store_mac_internal.h b/chrome/browser/password_manager/password_store_mac_internal.h
index 7e6fb9af04c33d82f1f483fa0d4e161796ab8889..f3f551a097140c97ccd8dd9ffd849507228aaa35 100644
--- a/chrome/browser/password_manager/password_store_mac_internal.h
+++ b/chrome/browser/password_manager/password_store_mac_internal.h
@@ -25,40 +25,40 @@ class MacKeychainPasswordFormAdapter {
 
   // Returns PasswordForms for each keychain entry that could be used to fill
   // |form|. Caller is responsible for deleting the returned forms.
-  std::vector<webkit_glue::PasswordForm*> PasswordsFillingForm(
-      const webkit_glue::PasswordForm& query_form);
+  std::vector<webkit::forms::PasswordForm*> PasswordsFillingForm(
+      const webkit::forms::PasswordForm& query_form);
 
   // Returns PasswordForms for each keychain entry that could be merged with
   // |form|. Differs from PasswordsFillingForm in that the username must match.
   // Caller is responsible for deleting the returned forms.
-  std::vector<webkit_glue::PasswordForm*> PasswordsMergeableWithForm(
-      const webkit_glue::PasswordForm& query_form);
+  std::vector<webkit::forms::PasswordForm*> PasswordsMergeableWithForm(
+      const webkit::forms::PasswordForm& query_form);
 
   // Returns the PasswordForm for the Keychain entry that matches |form| on all
   // of the fields that uniquely identify a Keychain item, or NULL if there is
   // no such entry.
   // Caller is responsible for deleting the returned form.
-  webkit_glue::PasswordForm* PasswordExactlyMatchingForm(
-      const webkit_glue::PasswordForm& query_form);
+  webkit::forms::PasswordForm* PasswordExactlyMatchingForm(
+      const webkit::forms::PasswordForm& query_form);
 
   // Returns true if PasswordsMergeableWithForm would return any items. This is
   // a separate method because calling PasswordsMergeableWithForm and checking
   // the return count would require reading the passwords from the keychain,
   // thus potentially triggering authorizaiton UI, whereas this won't.
   bool HasPasswordsMergeableWithForm(
-      const webkit_glue::PasswordForm& query_form);
+      const webkit::forms::PasswordForm& query_form);
 
   // Returns all keychain items of types corresponding to password forms.
-  std::vector<webkit_glue::PasswordForm*> GetAllPasswordFormPasswords();
+  std::vector<webkit::forms::PasswordForm*> GetAllPasswordFormPasswords();
 
   // Creates a new keychain entry from |form|, or updates the password of an
   // existing keychain entry if there is a collision. Returns true if a keychain
   // entry was successfully added/updated.
-  bool AddPassword(const webkit_glue::PasswordForm& form);
+  bool AddPassword(const webkit::forms::PasswordForm& form);
 
   // Removes the keychain password matching |form| if any. Returns true if a
   // keychain item was found and successfully removed.
-  bool RemovePassword(const webkit_glue::PasswordForm& form);
+  bool RemovePassword(const webkit::forms::PasswordForm& form);
 
   // Controls whether or not Chrome will restrict Keychain searches to items
   // that it created. Defaults to false.
@@ -68,22 +68,24 @@ class MacKeychainPasswordFormAdapter {
   // Returns PasswordForms constructed from the given Keychain items, calling
   // MacKeychain::Free on all of the keychain items and clearing the vector.
   // Caller is responsible for deleting the returned forms.
-  std::vector<webkit_glue::PasswordForm*> ConvertKeychainItemsToForms(
+  std::vector<webkit::forms::PasswordForm*> ConvertKeychainItemsToForms(
       std::vector<SecKeychainItemRef>* items);
 
   // Searches |keychain| for the specific keychain entry that corresponds to the
   // given form, and returns it (or NULL if no match is found). The caller is
   // responsible for calling MacKeychain::Free on on the returned item.
   SecKeychainItemRef KeychainItemForForm(
-      const webkit_glue::PasswordForm& form);
+      const webkit::forms::PasswordForm& form);
 
   // Returns the Keychain items matching the given signon_realm, scheme, and
   // optionally path and username (either of both can be NULL).
   // The caller is responsible for calling MacKeychain::Free on the
   // returned items.
   std::vector<SecKeychainItemRef> MatchingKeychainItems(
-      const std::string& signon_realm, webkit_glue::PasswordForm::Scheme scheme,
-      const char* path, const char* username);
+      const std::string& signon_realm,
+      webkit::forms::PasswordForm::Scheme scheme,
+      const char* path,
+      const char* username);
 
   // Takes a PasswordForm's signon_realm and parses it into its component parts,
   // which are returned though the appropriate out parameters.
@@ -97,7 +99,7 @@ class MacKeychainPasswordFormAdapter {
 
   // Returns the Keychain SecAuthenticationType type corresponding to |scheme|.
   SecAuthenticationType AuthTypeForScheme(
-      webkit_glue::PasswordForm::Scheme scheme);
+      webkit::forms::PasswordForm::Scheme scheme);
 
   // Changes the password for keychain_item to |password|; returns true if the
   // password was successfully changed.
@@ -139,12 +141,12 @@ namespace internal_keychain_helpers {
 // require authorization).
 bool FillPasswordFormFromKeychainItem(const MacKeychain& keychain,
                                       const SecKeychainItemRef& keychain_item,
-                                      webkit_glue::PasswordForm* form);
+                                      webkit::forms::PasswordForm* form);
 
 // Returns true if the two given forms match based on signon_reaml, scheme, and
 // username_value, and are thus suitable for merging (see MergePasswordForms).
-bool FormsMatchForMerge(const webkit_glue::PasswordForm& form_a,
-                        const webkit_glue::PasswordForm& form_b);
+bool FormsMatchForMerge(const webkit::forms::PasswordForm& form_a,
+                        const webkit::forms::PasswordForm& form_b);
 
 // Populates merged_forms by combining the password data from keychain_forms and
 // the metadata from database_forms, removing used entries from the two source
@@ -155,16 +157,17 @@ bool FormsMatchForMerge(const webkit_glue::PasswordForm& form_a,
 // password can be found (and which aren't blacklist entries), and for
 // keychain_forms it's entries that weren't merged into at least one database
 // form.
-void MergePasswordForms(std::vector<webkit_glue::PasswordForm*>* keychain_forms,
-                        std::vector<webkit_glue::PasswordForm*>* database_forms,
-                        std::vector<webkit_glue::PasswordForm*>* merged_forms);
+void MergePasswordForms(
+    std::vector<webkit::forms::PasswordForm*>* keychain_forms,
+    std::vector<webkit::forms::PasswordForm*>* database_forms,
+    std::vector<webkit::forms::PasswordForm*>* merged_forms);
 
 // Fills in the passwords for as many of the forms in |database_forms| as
 // possible using entries from |keychain| and returns them. On return,
 // |database_forms| will contain only the forms for which no password was found.
-std::vector<webkit_glue::PasswordForm*> GetPasswordsForForms(
+std::vector<webkit::forms::PasswordForm*> GetPasswordsForForms(
     const MacKeychain& keychain,
-    std::vector<webkit_glue::PasswordForm*>* database_forms);
+    std::vector<webkit::forms::PasswordForm*>* database_forms);
 
 }  // internal_keychain_helpers