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

chrome/browser/password_manager/native_backend_kwallet_x.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/native_backend_kwallet_x.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "base/stl_util.h"
 #include "base/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "content/public/browser/browser_thread.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_proxy.h"
 #include "grit/chromium_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::BrowserThread;
-using webkit_glue::PasswordForm;
+using webkit::forms::PasswordForm;
 
 // We could localize this string, but then changing your locale would cause
 // you to lose access to all your stored passwords. Maybe best not to do that.
 const char NativeBackendKWallet::kKWalletFolder[] = "Chrome Form Data";
 
 const char NativeBackendKWallet::kKWalletServiceName[] = "org.kde.kwalletd";
 const char NativeBackendKWallet::kKWalletPath[] = "/modules/kwalletd";
 const char NativeBackendKWallet::kKWalletInterface[] = "org.kde.KWallet";
 const char NativeBackendKWallet::kKLauncherServiceName[] = "org.kde.klauncher";
 const char NativeBackendKWallet::kKLauncherPath[] = "/KLauncher";
@@ skipping 853 matching lines @@
     // Each other profile must be able to migrate the shared data as well,
     // so we must leave it alone. After a few releases, we'll add code to
     // delete them, and eventually remove this migration code.
     // TODO(mdm): follow through with the plan above.
     PasswordStoreX::SetPasswordsUseLocalProfileId(prefs_);
   } else {
     // We failed to migrate for some reason. Use the old folder name.
     folder_name_ = kKWalletFolder;
   }
 }