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

content/public/common/webkit_param_traits.cc

Index: content/public/common/webkit_param_traits.cc
diff --git a/content/public/common/webkit_param_traits.cc b/content/public/common/webkit_param_traits.cc
index 96a0ba4fcad2170f45f2f012dbf76b3c13295324..555bd77b9fdc756c9d2bf17a2c2a0af76e505ab5 100644
--- a/content/public/common/webkit_param_traits.cc
+++ b/content/public/common/webkit_param_traits.cc
@@ -11,7 +11,7 @@
 #include "content/public/common/common_param_traits.h"
 #include "content/public/common/content_constants.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBindings.h"
-#include "webkit/glue/password_form.h"
+#include "webkit/forms/password_form.h"
 #include "webkit/glue/resource_loader_bridge.h"
 #include "webkit/plugins/npapi/plugin_host.h"
 
@@ -306,8 +306,8 @@ void ParamTraits<webkit::WebPluginInfo>::Log(const param_type& p,
   l->append(")");
 }
 
-void ParamTraits<webkit_glue::PasswordForm>::Write(Message* m,
-                                                   const param_type& p) {
+void ParamTraits<webkit::forms::PasswordForm>::Write(Message* m,
+                                                     const param_type& p) {
   WriteParam(m, p.signon_realm);
   WriteParam(m, p.origin);
   WriteParam(m, p.action);
@@ -323,8 +323,9 @@ void ParamTraits<webkit_glue::PasswordForm>::Write(Message* m,
   WriteParam(m, p.blacklisted_by_user);
 }
 
-bool ParamTraits<webkit_glue::PasswordForm>::Read(const Message* m, void** iter,
-                                                  param_type* p) {
+bool ParamTraits<webkit::forms::PasswordForm>::Read(const Message* m,
+                                                    void** iter,
+                                                    param_type* p) {
   return
       ReadParam(m, iter, &p->signon_realm) &&
       ReadParam(m, iter, &p->origin) &&
@@ -340,8 +341,8 @@ bool ParamTraits<webkit_glue::PasswordForm>::Read(const Message* m, void** iter,
       ReadParam(m, iter, &p->preferred) &&
       ReadParam(m, iter, &p->blacklisted_by_user);
 }
-void ParamTraits<webkit_glue::PasswordForm>::Log(const param_type& p,
-                                                 std::string* l) {
+void ParamTraits<webkit::forms::PasswordForm>::Log(const param_type& p,
+                                                   std::string* l) {
   l->append("<PasswordForm>");
 }