Move forms/ out of webkit/.

chrome/browser/sync/glue/password_model_associator.h

Index: chrome/browser/sync/glue/password_model_associator.h
diff --git a/chrome/browser/sync/glue/password_model_associator.h b/chrome/browser/sync/glue/password_model_associator.h
index e3d14f3244794c8fd90220045545b77c16695a1d..5c68efa284757744db0fc5a9034f968900dd0f38 100644
--- a/chrome/browser/sync/glue/password_model_associator.h
+++ b/chrome/browser/sync/glue/password_model_associator.h
@@ -21,11 +21,9 @@ class MessageLoop;
 class PasswordStore;
 class ProfileSyncService;
 
-namespace webkit {
-namespace forms {
+namespace content {
 struct PasswordForm;
 }
-}
 
 namespace syncer {
 class WriteNode;
@@ -44,7 +42,7 @@ extern const char kPasswordTag[];
 class PasswordModelAssociator
   : public PerDataTypeAssociatorInterface<std::string, std::string> {
  public:
-  typedef std::vector<webkit::forms::PasswordForm> PasswordVector;
+  typedef std::vector<content::PasswordForm> PasswordVector;
 
   static syncer::ModelType model_type() { return syncer::PASSWORDS; }
   PasswordModelAssociator(ProfileSyncService* sync_service,
@@ -98,7 +96,7 @@ class PasswordModelAssociator
                                  const PasswordVector* updated_passwords,
                                  const PasswordVector* deleted_passwords);
 
-  static std::string MakeTag(const webkit::forms::PasswordForm& password);
+  static std::string MakeTag(const content::PasswordForm& password);
   static std::string MakeTag(const sync_pb::PasswordSpecificsData& password);
   static std::string MakeTag(const std::string& origin_url,
                              const std::string& username_element,
@@ -107,12 +105,12 @@ class PasswordModelAssociator
                              const std::string& signon_realm);
 
   static void CopyPassword(const sync_pb::PasswordSpecificsData& password,
-                           webkit::forms::PasswordForm* new_password);
+                           content::PasswordForm* new_password);
 
   static bool MergePasswords(const sync_pb::PasswordSpecificsData& password,
-                             const webkit::forms::PasswordForm& password_form,
-                             webkit::forms::PasswordForm* new_password);
-  static void WriteToSyncNode(const webkit::forms::PasswordForm& password_form,
+                             const content::PasswordForm& password_form,
+                             content::PasswordForm* new_password);
+  static void WriteToSyncNode(const content::PasswordForm& password_form,
                               syncer::WriteNode* node);
 
   // Called at various points in model association to determine if the