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

chrome/browser/password_manager/password_manager.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/password_manager/password_manager.h"
 
 #include <vector>
 
 #include "base/stl_util.h"
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_form_manager.h"
 #include "chrome/browser/password_manager/password_manager_delegate.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/autofill_messages.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "grit/generated_resources.h"
 
 using content::UserMetricsAction;
-using webkit_glue::PasswordForm;
-using webkit_glue::PasswordFormMap;
+using webkit::forms::PasswordForm;
+using webkit::forms::PasswordFormMap;
 
 // static
 void PasswordManager::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kPasswordManagerEnabled,
                              true,
                              PrefService::SYNCABLE_PREF);
   prefs->RegisterBooleanPref(prefs::kPasswordManagerAllowShowPasswords,
                              true,
                              PrefService::UNSYNCABLE_PREF);
 }
@@ skipping 184 matching lines @@
 void PasswordManager::Autofill(
     const PasswordForm& form_for_autofill,
     const PasswordFormMap& best_matches,
     const PasswordForm* const preferred_match,
     bool wait_for_username) const {
   DCHECK(preferred_match);
   switch (form_for_autofill.scheme) {
     case PasswordForm::SCHEME_HTML: {
       // Note the check above is required because the observer_ for a non-HTML
       // schemed password form may have been freed, so we need to distinguish.
-      webkit_glue::PasswordFormFillData fill_data;
-      webkit_glue::PasswordFormDomManager::InitFillData(form_for_autofill,
+      webkit::forms::PasswordFormFillData fill_data;
+      webkit::forms::PasswordFormDomManager::InitFillData(form_for_autofill,
                                                         best_matches,
                                                         preferred_match,
                                                         wait_for_username,
                                                         &fill_data);
       delegate_->FillPasswordForm(fill_data);
       return;
     }
     default:
       if (observer_) {
         observer_->OnAutofillDataAvailable(preferred_match->username_value,
                                            preferred_match->password_value);
       }
   }
 }