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

chrome/browser/importer/nss_decryptor_win.h

Index: chrome/browser/importer/nss_decryptor_win.h
diff --git a/chrome/browser/importer/nss_decryptor_win.h b/chrome/browser/importer/nss_decryptor_win.h
index 891db8911aecfe0b9dc4f5b8536d75f0211ec319..a5e1182d9113184089511bad59b1fef951cec98f 100644
--- a/chrome/browser/importer/nss_decryptor_win.h
+++ b/chrome/browser/importer/nss_decryptor_win.h
@@ -105,9 +105,11 @@ 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 {
@@ -131,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:
   // Call NSS initialization funcs.