Fix autofill popup controller key press callback registration

components/password_manager/core/browser/password_autofill_manager.cc

 // Copyright 2013 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 "components/password_manager/core/browser/password_autofill_manager.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "components/autofill/core/browser/autofill_driver.h"
+#include "components/autofill/core/browser/autofill_client.h"
 #include "components/autofill/core/browser/autofill_experiments.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "components/autofill/core/browser/suggestion.h"
 #include "components/autofill/core/common/autofill_constants.h"
 #include "components/autofill/core/common/autofill_data_validation.h"
 #include "components/autofill/core/common/autofill_util.h"
 #include "components/password_manager/core/browser/affiliation_utils.h"
 #include "components/password_manager/core/browser/password_manager_driver.h"
 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
 #include "components/security_state/core/security_state.h"
@@ skipping 100 matching lines @@
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // PasswordAutofillManager, public:
 
 PasswordAutofillManager::PasswordAutofillManager(
     PasswordManagerDriver* password_manager_driver,
     autofill::AutofillClient* autofill_client)
     : password_manager_driver_(password_manager_driver),
       autofill_client_(autofill_client),
-      weak_ptr_factory_(this) {
-}
+      weak_ptr_factory_(this) {}
 
 PasswordAutofillManager::~PasswordAutofillManager() {
 }
 
 bool PasswordAutofillManager::FillSuggestion(int key,
                                              const base::string16& username) {
   autofill::PasswordFormFillData fill_data;
   autofill::PasswordAndRealm password_and_realm;
   if (FindLoginInfo(key, &fill_data) &&
       GetPasswordAndRealmForUsername(
@@ skipping 193 matching lines @@
 }
 
 void PasswordAutofillManager::ClearPreviewedForm() {
   password_manager_driver_->ClearPreviewedForm();
 }
 
 bool PasswordAutofillManager::IsCreditCardPopup() {
   return false;
 }
 
+autofill::AutofillDriver* PasswordAutofillManager::GetAutofillDriver() {
+  return password_manager_driver_->GetAutofillDriver();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // PasswordAutofillManager, private:
 
 bool PasswordAutofillManager::GetPasswordAndRealmForUsername(
     const base::string16& current_username,
     const autofill::PasswordFormFillData& fill_data,
     autofill::PasswordAndRealm* password_and_realm) {
   // TODO(dubroy): When password access requires some kind of authentication
   // (e.g. Keychain access on Mac OS), use |password_manager_client_| here to
   // fetch the actual password. See crbug.com/178358 for more context.
@@ skipping 36 matching lines @@
     autofill::PasswordFormFillData* found_password) {
   LoginToPasswordInfoMap::iterator iter = login_to_password_info_.find(key);
   if (iter == login_to_password_info_.end())
     return false;
 
   *found_password = iter->second;
   return true;
 }
 
 }  //  namespace password_manager