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

chrome/browser/importer/external_process_importer_client.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_IMPORTER_EXTERNAL_PROCESS_IMPORTER_CLIENT_H_
 #define CHROME_BROWSER_IMPORTER_EXTERNAL_PROCESS_IMPORTER_CLIENT_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 58 matching lines @@
       const std::vector<history::URLRow>& history_rows_group,
       int visit_source);
   void OnHomePageImportReady(const GURL& home_page);
   void OnBookmarksImportStart(const string16& first_folder_name,
                                       size_t total_bookmarks_count);
   void OnBookmarksImportGroup(
       const std::vector<ProfileWriter::BookmarkEntry>& bookmarks_group);
   void OnFaviconsImportStart(size_t total_favicons_count);
   void OnFaviconsImportGroup(
       const std::vector<history::ImportedFaviconUsage>& favicons_group);
-  void OnPasswordFormImportReady(const webkit_glue::PasswordForm& form);
+  void OnPasswordFormImportReady(const webkit::forms::PasswordForm& form);
   void OnKeywordsImportReady(
       const std::vector<TemplateURL>& template_urls,
       int default_keyword_index,
       bool unique_on_host_and_path);
 
  private:
   // These variables store data being collected from the importer until the
   // entire group has been collected and is ready to be written to the profile.
   std::vector<history::URLRow> history_rows_;
   std::vector<ProfileWriter::BookmarkEntry> bookmarks_;
@@ skipping 31 matching lines @@
   // destructor.
   InProcessImporterBridge* bridge_;
 
   // True if import process has been cancelled.
   bool cancelled_;
 
   DISALLOW_COPY_AND_ASSIGN(ExternalProcessImporterClient);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_EXTERNAL_PROCESS_IMPORTER_CLIENT_H_