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

chrome/browser/importer/nss_decryptor_null.h

Index: chrome/browser/importer/nss_decryptor_null.h
diff --git a/chrome/browser/importer/nss_decryptor_null.h b/chrome/browser/importer/nss_decryptor_null.h
index af725c1933c67798af2883036ce02ab62103f8f8..e82d1a6c44572921b3581f7c206ec21796794a39 100644
--- a/chrome/browser/importer/nss_decryptor_null.h
+++ b/chrome/browser/importer/nss_decryptor_null.h
@@ -14,9 +14,11 @@
 
 class FilePath;
 
-namespace webkit_glue {
+namespace webkit {
+namespace forms {
 struct PasswordForm;
 }
+}
 
 // A NULL wrapper for Firefox NSS decrypt component, for use in builds where
 // we do not have the NSS library.
@@ -26,9 +28,9 @@ class NSSDecryptor {
   bool Init(const FilePath& dll_path, const FilePath& db_path) { return false; }
   string16 Decrypt(const std::string& crypt) const { return string16(); }
   void ParseSignons(const std::string& content,
-                    std::vector<webkit_glue::PasswordForm>* forms) {}
+                    std::vector<webkit::forms::PasswordForm>* forms) {}
   bool ReadAndParseSignons(const FilePath& sqlite_file,
-                           std::vector<webkit_glue::PasswordForm>* forms) {
+                           std::vector<webkit::forms::PasswordForm>* forms) {
     return false;
   }