Move forms/ out of webkit/.

chrome/browser/importer/profile_writer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/importer/profile_writer.h"
 
 #include <map>
 #include <set>
 #include <string>
 
@@ skipping 73 matching lines @@
 ProfileWriter::ProfileWriter(Profile* profile) : profile_(profile) {}
 
 bool ProfileWriter::BookmarkModelIsLoaded() const {
   return BookmarkModelFactory::GetForProfile(profile_)->IsLoaded();
 }
 
 bool ProfileWriter::TemplateURLServiceIsLoaded() const {
   return TemplateURLServiceFactory::GetForProfile(profile_)->loaded();
 }
 
-void ProfileWriter::AddPasswordForm(const webkit::forms::PasswordForm& form) {
+void ProfileWriter::AddPasswordForm(const content::PasswordForm& form) {
   PasswordStoreFactory::GetForProfile(
       profile_, Profile::EXPLICIT_ACCESS)->AddLogin(form);
 }
 
 #if defined(OS_WIN)
 void ProfileWriter::AddIE7PasswordInfo(const IE7PasswordInfo& info) {
   WebDataServiceFactory::GetForProfile(
       profile_, Profile::EXPLICIT_ACCESS)->AddIE7Login(info);
 }
 #endif
@@ skipping 216 matching lines @@
 
     // Only add valid TemplateURLs to the model.
     if ((*i)->url_ref().IsValid()) {
       model->AddAndSetProfile(*i, profile_);  // Takes ownership.
       *i = NULL;  // Prevent the vector from deleting *i later.
     }
   }
 }
 
 ProfileWriter::~ProfileWriter() {}