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

chrome/browser/importer/nss_decryptor_system_nss.h

Index: chrome/browser/importer/nss_decryptor_system_nss.h
diff --git a/chrome/browser/importer/nss_decryptor_system_nss.h b/chrome/browser/importer/nss_decryptor_system_nss.h
index b4087d9de65316f7c59b06149679966a83d4be25..4399cab3f28dd094379f097eee300c7c3c5889d8 100644
--- a/chrome/browser/importer/nss_decryptor_system_nss.h
+++ b/chrome/browser/importer/nss_decryptor_system_nss.h
@@ -15,9 +15,11 @@
 
 class FilePath;
 
-namespace webkit_glue {
+namespace webkit {
+namespace forms {
 struct PasswordForm;
 }
+}
 
 // A wrapper for Firefox NSS decrypt component.
 class NSSDecryptor {
@@ -36,13 +38,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:
   // Does not actually free the slot, since we'll free it when NSSDecryptor is
   // destroyed.