Fix autofill popup controller key press callback registration

chrome/browser/ui/autofill/autofill_popup_controller_impl.h

Index: chrome/browser/ui/autofill/autofill_popup_controller_impl.h
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
index e8a76251cead1fe1b17a8f5b4570f64e0c20758f..a0858c68d1a2a4488bab31de7caea9c1a4b6101a 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
@@ -21,6 +21,11 @@
 #include "ui/gfx/geometry/rect_f.h"
 #include "ui/native_theme/native_theme.h"
 
+namespace content {
+struct NativeWebKeyboardEvent;

[vabr (Chromium), 2017/04/05 14:53:34]

This is used on line 65. Due to reduction in popup_controller_common.h, it is
now necessary to declare it here.

+class WebContents;
+}
+
 namespace autofill {
 
 class AutofillPopupDelegate;
@@ -102,8 +107,6 @@ class AutofillPopupControllerImpl : public AutofillPopupController {
   base::Optional<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(base::Optional<int> selected_line);
 
@@ -132,7 +135,7 @@ class AutofillPopupControllerImpl : public AutofillPopupController {
 
   // 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)