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

chrome/browser/importer/ie_importer.cc

Index: chrome/browser/importer/ie_importer.cc
diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc
index c6bcf099e647b8c6aace2ff01fb5664fb167b0c5..1d34c6a6ffb41a8f197cc979979f45c3c94de808 100644
--- a/chrome/browser/importer/ie_importer.cc
+++ b/chrome/browser/importer/ie_importer.cc
@@ -17,9 +17,9 @@
 
 #include "base/file_path.h"
 #include "base/file_util.h"
+#include "base/string16.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
-#include "base/string16.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/registry.h"
@@ -39,7 +39,7 @@
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "webkit/glue/password_form.h"
+#include "webkit/forms/password_form.h"
 
 namespace {
 
@@ -280,7 +280,7 @@ void IEImporter::ImportPasswordsIE6() {
       continue;
     }
 
-    webkit_glue::PasswordForm form;
+    webkit::forms::PasswordForm form;
     GURL::Replacements rp;
     rp.ClearUsername();
     rp.ClearPassword();