Move PasswordForm from //content to //autofill.

chrome/browser/password_manager/password_store_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/password_store_x.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/password_manager/password_store_change.h"
 #include "chrome/common/pref_names.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 
+using autofill::PasswordForm;
 using content::BrowserThread;
 using std::vector;
-using content::PasswordForm;
 
 PasswordStoreX::PasswordStoreX(LoginDatabase* login_db,
                                Profile* profile,
                                NativeBackend* backend)
     : PasswordStoreDefault(login_db, profile),
       backend_(backend), migration_checked_(!backend), allow_fallback_(false) {
 }
 
 PasswordStoreX::~PasswordStoreX() {}
 
@@ skipping 75 matching lines @@
   }
 };
 }  // anonymous namespace
 
 void PasswordStoreX::SortLoginsByOrigin(NativeBackend::PasswordFormList* list) {
   // In login_database.cc, the query has ORDER BY origin_url. Simulate that.
   std::sort(list->begin(), list->end(), LoginLessThan());
 }
 
 void PasswordStoreX::GetLoginsImpl(
-    const content::PasswordForm& form,
+    const autofill::PasswordForm& form,
     const ConsumerCallbackRunner& callback_runner) {
   CheckMigration();
-  std::vector<content::PasswordForm*> matched_forms;
+  std::vector<autofill::PasswordForm*> matched_forms;
   if (use_native_backend() && backend_->GetLogins(form, &matched_forms)) {
     SortLoginsByOrigin(&matched_forms);
     callback_runner.Run(matched_forms);
     // The native backend may succeed and return no data even while locked, if
     // the query did not match anything stored. So we continue to allow fallback
     // until we perform a write operation, or until a read returns actual data.
     if (matched_forms.size() > 0)
       allow_fallback_ = false;
   } else if (allow_default_store()) {
     DCHECK(matched_forms.empty());
@@ skipping 166 matching lines @@
 }  // anonymous namespace
 
 // static
 void PasswordStoreX::SetPasswordsUseLocalProfileId(PrefService* prefs) {
   // This method should work on any thread, but we expect the DB thread.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                           base::Bind(&UISetPasswordsUseLocalProfileId, prefs));
 }
 #endif  // !defined(OS_MACOSX) && !defined(OS_CHROMEOS) && defined(OS_POSIX)