Move forms/ out of webkit/.

chrome/browser/importer/external_process_importer_client.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/external_process_importer_client.h"
 
 #include "base/bind.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/importer/external_process_importer_host.h"
@@ skipping 201 matching lines @@
   if (cancelled_)
     return;
 
   favicons_.insert(favicons_.end(), favicons_group.begin(),
                     favicons_group.end());
   if (favicons_.size() == total_favicons_count_)
     bridge_->SetFavicons(favicons_);
 }
 
 void ExternalProcessImporterClient::OnPasswordFormImportReady(
-    const webkit::forms::PasswordForm& form) {
+    const content::PasswordForm& form) {
   if (cancelled_)
     return;
 
   bridge_->SetPasswordForm(form);
 }
 
 void ExternalProcessImporterClient::OnKeywordsImportReady(
     const std::vector<TemplateURL*>& template_urls,
     bool unique_on_host_and_path) {
   if (cancelled_)
@@ skipping 57 matching lines @@
   localized_strings.SetString(
       base::IntToString(IDS_IMPORT_FROM_SAFARI),
       l10n_util::GetStringUTF8(IDS_IMPORT_FROM_SAFARI));
   localized_strings.SetString(
       base::IntToString(IDS_BOOKMARK_BAR_FOLDER_NAME),
       l10n_util::GetStringUTF8(IDS_BOOKMARK_BAR_FOLDER_NAME));
 
   utility_process_host_->Send(new ProfileImportProcessMsg_StartImport(
       source_profile_, items_, localized_strings));
 }