Fix autofill popup controller key press callback registration

chrome/browser/ui/autofill/autofill_popup_controller_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_CONTROLLER_IMPL_H_
 
 #include <stddef.h>
 
 #include "base/gtest_prod_util.h"
 #include "base/i18n/rtl.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller.h"
 #include "chrome/browser/ui/autofill/autofill_popup_layout_model.h"
 #include "chrome/browser/ui/autofill/popup_controller_common.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/native_theme/native_theme.h"
 
+namespace content {
+struct NativeWebKeyboardEvent;
+class WebContents;
+}
+
 namespace autofill {
 
 class AutofillPopupDelegate;
 class AutofillPopupView;
 
 // This class is a controller for an AutofillPopupView. It implements
 // AutofillPopupController to allow calls from AutofillPopupView. The
 // other, public functions are available to its instantiator.
 class AutofillPopupControllerImpl : public AutofillPopupController {
  public:
@@ skipping 61 matching lines @@
   const base::string16& GetElidedValueAt(size_t row) const override;
   const base::string16& GetElidedLabelAt(size_t row) const override;
   bool GetRemovalConfirmationText(int list_index,
                                   base::string16* title,
                                   base::string16* body) override;
   bool RemoveSuggestion(int list_index) override;
   ui::NativeTheme::ColorId GetBackgroundColorIDForRow(int index) const override;
   int selected_line() const override;
   const AutofillPopupLayoutModel& layout_model() const override;
 
-  content::WebContents* web_contents();
-
   // Change which line is currently selected by the user.
   void SetSelectedLine(int selected_line);
 
   // Increase the selected line by 1, properly handling wrapping.
   void SelectNextLine();
 
   // Decrease the selected line by 1, properly handling wrapping.
   void SelectPreviousLine();
 
   // The user has removed a suggestion.
@@ skipping 12 matching lines @@
   AutofillPopupView* view() { return view_; }
 
   // |view_| pass throughs (virtual for testing).
   virtual void ShowView();
   virtual void InvalidateRow(size_t row);
 
   base::WeakPtr<AutofillPopupControllerImpl> GetWeakPtr();
 
   // Contains common popup functionality such as popup layout. Protected for
   // testing.
-  std::unique_ptr<PopupControllerCommon> controller_common_;
+  const PopupControllerCommon controller_common_;
 
  private:
 #if !defined(OS_ANDROID)
   FRIEND_TEST_ALL_PREFIXES(AutofillPopupControllerUnitTest, ElideText);
 
   // Helper method which elides the value and label for the suggestion at |row|
   // given the |available_width|. Puts the results in |elided_values_| and
   // |elided_labels_|.
   void ElideValueAndLabelForRow(size_t row, int available_width);
 #endif
@@ skipping 20 matching lines @@
   // The line that is currently selected by the user.
   // |kNoSelection| indicates that no line is currently selected.
   int selected_line_;
 
   base::WeakPtrFactory<AutofillPopupControllerImpl> weak_ptr_factory_;
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_POPUP_CONTROLLER_IMPL_H_