Move PasswordForm from //content to //autofill.

chrome/browser/password_manager/native_backend_kwallet_x.cc

 // Copyright (c) 2012 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/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/public/browser/browser_thread.h"
 #include "dbus/bus.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "grit/chromium_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
+using autofill::PasswordForm;
 using content::BrowserThread;
-using content::PasswordForm;
 
 namespace {
 
 // 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.
 // Name of the folder to store passwords in.
 const char kKWalletFolder[] = "Chrome Form Data";
 
 // DBus service, path, and interface names for klauncher and kwalletd.
 const char kKWalletServiceName[] = "org.kde.kwalletd";
 const char kKWalletPath[] = "/modules/kwalletd";
 const char kKWalletInterface[] = "org.kde.KWallet";
 const char kKLauncherServiceName[] = "org.kde.klauncher";
 const char kKLauncherPath[] = "/KLauncher";
 const char kKLauncherInterface[] = "org.kde.KLauncher";
 
 // Compares two PasswordForms and returns true if they are the same.
 // If |update_check| is false, we only check the fields that are checked by
 // LoginDatabase::UpdateLogin() when updating logins; otherwise, we check the
 // fields that are checked by LoginDatabase::RemoveLogin() for removing them.
-bool CompareForms(const content::PasswordForm& a,
-                  const content::PasswordForm& b,
+bool CompareForms(const autofill::PasswordForm& a,
+                  const autofill::PasswordForm& b,
                   bool update_check) {
   // An update check doesn't care about the submit element.
   if (!update_check && a.submit_element != b.submit_element)
     return false;
   return a.origin           == b.origin &&
          a.password_element == b.password_element &&
          a.signon_realm     == b.signon_realm &&
          a.username_element == b.username_element &&
          a.username_value   == b.username_value;
 }
@@ skipping 903 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;
   }
 }