Move PasswordForm from //content to //autofill.

chrome/browser/password_manager/password_store_win.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_win.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/password_manager/password_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "components/webdata/encryptor/ie7_password.h"
 
+using autofill::PasswordForm;
 using content::BrowserThread;
-using content::PasswordForm;
 
 // Handles requests to WebDataService.
 class PasswordStoreWin::DBHandler : public WebDataServiceConsumer {
  public:
   DBHandler(WebDataService* web_data_service,
             PasswordStoreWin* password_store)
       : web_data_service_(web_data_service),
         password_store_(password_store) {
   }
 
@@ skipping 105 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
 
   PendingRequestMap::iterator i = pending_requests_.find(handle);
   DCHECK(i != pending_requests_.end());
 
   scoped_ptr<PasswordForm> form(i->second.form);
   PasswordStoreWin::ConsumerCallbackRunner callback_runner(
       i->second.callback_runner);
   pending_requests_.erase(i);
 
-  std::vector<content::PasswordForm*> matched_forms;
+  std::vector<autofill::PasswordForm*> matched_forms;
 
   if (!result) {
     // The WDS returns NULL if it is shutting down. Run callback with empty
     // result.
     callback_runner.Run(matched_forms);
     return;
   }
 
   DCHECK_EQ(PASSWORD_IE7_RESULT, result->GetType());
   PasswordForm* ie7_form = GetIE7Result(result, *form);
@@ skipping 22 matching lines @@
 void PasswordStoreWin::ShutdownOnUIThread() {
   BrowserThread::PostTask(
       BrowserThread::DB, FROM_HERE,
       base::Bind(&PasswordStoreWin::ShutdownOnDBThread, this));
   PasswordStoreDefault::ShutdownOnUIThread();
 }
 
 void PasswordStoreWin::GetIE7LoginIfNecessary(
     const PasswordForm& form,
     const ConsumerCallbackRunner& callback_runner,
-    const std::vector<content::PasswordForm*>& matched_forms) {
+    const std::vector<autofill::PasswordForm*>& matched_forms) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB));
   if (matched_forms.empty() && db_handler_.get()) {
     db_handler_->GetIE7Login(form, callback_runner);
   } else {
     // No need to get IE7 login.
     callback_runner.Run(matched_forms);
   }
 }
 
 void PasswordStoreWin::GetLoginsImpl(
     const PasswordForm& form,
     const ConsumerCallbackRunner& callback_runner) {
   ConsumerCallbackRunner get_ie7_login =
       base::Bind(&PasswordStoreWin::GetIE7LoginIfNecessary,
                  this, form, callback_runner);
   PasswordStoreDefault::GetLoginsImpl(form, get_ie7_login);
 }