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

chrome/browser/importer/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_IMPORTER_BRIDGE_H_
 #define CHROME_BROWSER_IMPORTER_IMPORTER_BRIDGE_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 24 matching lines @@
   virtual void SetFavicons(
       const std::vector<history::ImportedFaviconUsage>& favicons) = 0;
 
   virtual void SetHistoryItems(const std::vector<history::URLRow>& rows,
                                history::VisitSource visit_source) = 0;
 
   virtual void SetKeywords(const std::vector<TemplateURL*>& template_urls,
                            int default_keyword_index,
                            bool unique_on_host_and_path) = 0;
 
-  virtual void SetPasswordForm(const webkit_glue::PasswordForm& form) = 0;
+  virtual void SetPasswordForm(const webkit::forms::PasswordForm& form) = 0;
 
   // Notifies the coordinator that the import operation has begun.
   virtual void NotifyStarted() = 0;
 
   // Notifies the coordinator that the collection of data for the specified
   // item has begun.
   virtual void NotifyItemStarted(importer::ImportItem item) = 0;
 
   // Notifies the coordinator that the collection of data for the specified
   // item has completed.
@@ skipping 14 matching lines @@
   // connection, but as an interim step we allow Toolbar5Import to break
   // the abstraction here and assume import is in-process.
   friend class Toolbar5Importer;
 
   virtual ~ImporterBridge();
 
   DISALLOW_COPY_AND_ASSIGN(ImporterBridge);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_IMPORTER_BRIDGE_H_