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

chrome/browser/importer/external_process_importer_client.cc

 // 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.
 
 #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 267 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_glue::PasswordForm& form) {
+    const webkit::forms::PasswordForm& form) {
   if (cancelled_)
     return;
 
   bridge_->SetPasswordForm(form);
 }
 
 void ExternalProcessImporterClient::OnKeywordsImportReady(
     const std::vector<TemplateURL>& template_urls,
         int default_keyword_index, bool unique_on_host_and_path) {
   if (cancelled_)
     return;
 
   std::vector<TemplateURL*> template_url_vec;
   template_url_vec.reserve(template_urls.size());
   std::vector<TemplateURL>::const_iterator iter;
   for (iter = template_urls.begin();
        iter != template_urls.end();
        ++iter) {
     template_url_vec.push_back(new TemplateURL(*iter));
   }
   bridge_->SetKeywords(template_url_vec, default_keyword_index,
                        unique_on_host_and_path);
 }