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

chrome/browser/importer/nss_decryptor_mac.h

Index: chrome/browser/importer/nss_decryptor_mac.h
diff --git a/chrome/browser/importer/nss_decryptor_mac.h b/chrome/browser/importer/nss_decryptor_mac.h
index e88fd11205cdd619291fc1695299362fa23034cc..23d1e69456f232ea731a23f4e734e171c6a9ee59 100644
--- a/chrome/browser/importer/nss_decryptor_mac.h
+++ b/chrome/browser/importer/nss_decryptor_mac.h
@@ -105,9 +105,12 @@ typedef SECStatus
 typedef void (*SECITEMFreeItemFunc)(SECItem *item, PRBool free_it);
 typedef void (*PLArenaFinishFunc)(void);
 typedef PRStatus (*PRCleanupFunc)(void);
-namespace webkit_glue {
+
+namespace webkit {
+namespace forms {
 struct PasswordForm;
 }
+}
 
 // A wrapper for Firefox NSS decrypt component.
 class NSSDecryptor {
@@ -130,13 +133,13 @@ class NSSDecryptor {
   // username/password and reads other related information.
   // The result will be stored in |forms|.
   void ParseSignons(const std::string& content,
-                    std::vector<webkit_glue::PasswordForm>* forms);
+                    std::vector<webkit::forms::PasswordForm>* forms);
 
   // Reads and parses the Firefox password sqlite db, decrypts the
   // username/password and reads other related information.
   // The result will be stored in |forms|.
   bool ReadAndParseSignons(const FilePath& sqlite_file,
-                           std::vector<webkit_glue::PasswordForm>* forms);
+                           std::vector<webkit::forms::PasswordForm>* forms);
  private:
   PK11SlotInfo* GetKeySlotForDB() const { return PK11_GetInternalKeySlot(); }
   void FreeSlot(PK11SlotInfo* slot) const { PK11_FreeSlot(slot); }