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

chrome/browser/importer/external_process_importer_bridge.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_BRIDGE_H_
 #define CHROME_BROWSER_IMPORTER_EXTERNAL_PROCESS_IMPORTER_BRIDGE_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 36 matching lines @@
   virtual void SetFavicons(
       const std::vector<history::ImportedFaviconUsage>& favicons) OVERRIDE;
 
   virtual void SetHistoryItems(const std::vector<history::URLRow>& rows,
                                history::VisitSource visit_source) OVERRIDE;
 
   virtual void SetKeywords(const std::vector<TemplateURL*>& template_urls,
                            int default_keyword_index,
                            bool unique_on_host_and_path) OVERRIDE;
 
-  virtual void SetPasswordForm(const webkit_glue::PasswordForm& form) OVERRIDE;
+  virtual void SetPasswordForm(
+      const webkit::forms::PasswordForm& form) OVERRIDE;
 
   virtual void NotifyStarted() OVERRIDE;
   virtual void NotifyItemStarted(importer::ImportItem item) OVERRIDE;
   virtual void NotifyItemEnded(importer::ImportItem item) OVERRIDE;
   virtual void NotifyEnded() OVERRIDE;
 
   virtual string16 GetLocalizedString(int message_id) OVERRIDE;
   // End ImporterBridge implementation.
 
  private:
   virtual ~ExternalProcessImporterBridge();
 
   bool Send(IPC::Message* message);
 
   // Holds strings needed by the external importer because the resource
   // bundle isn't available to the external process.
   scoped_ptr<base::DictionaryValue> localized_strings_;
 
   IPC::Message::Sender* sender_;
 
   DISALLOW_COPY_AND_ASSIGN(ExternalProcessImporterBridge);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_EXTERNAL_PROCESS_IMPORTER_BRIDGE_H_