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

content/browser/tab_contents/test_tab_contents.cc

Index: content/browser/tab_contents/test_tab_contents.cc
diff --git a/content/browser/tab_contents/test_tab_contents.cc b/content/browser/tab_contents/test_tab_contents.cc
index 52c0cb0d2f47f8625edab0c68f4aa51c84a62768..99a2f57137c58f2d992fee8f414061243fa36947 100644
--- a/content/browser/tab_contents/test_tab_contents.cc
+++ b/content/browser/tab_contents/test_tab_contents.cc
@@ -13,8 +13,8 @@
 #include "content/browser/site_instance.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/page_transition_types.h"
-#include "webkit/glue/password_form.h"
 #include "webkit/glue/webkit_glue.h"
+#include "webkit/forms/password_form.h"
 
 TestTabContents::TestTabContents(content::BrowserContext* browser_context,
                                  SiteInstance* instance)
@@ -62,7 +62,7 @@ void TestTabContents::TestDidNavigateWithReferrer(
   params.should_update_history = false;
   params.searchable_form_url = GURL();
   params.searchable_form_encoding = std::string();
-  params.password_form = webkit_glue::PasswordForm();
+  params.password_form = webkit::forms::PasswordForm();
   params.security_info = std::string();
   params.gesture = NavigationGestureUser;
   params.was_within_same_page = false;