[Autofill] Move functions from the AutofillPopupController to AutofillPopupLayoutModel

chrome/browser/ui/autofill/autofill_popup_controller.h

Index: chrome/browser/ui/autofill/autofill_popup_controller.h
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller.h b/chrome/browser/ui/autofill/autofill_popup_controller.h
index 8f226988cf04757a46eef30b27ceba1393dc7bfb..b077458edd06b293df6560314cede64417a14958 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller.h
+++ b/chrome/browser/ui/autofill/autofill_popup_controller.h
@@ -22,6 +22,7 @@ class Rect;
 
 namespace autofill {
 
+class AutofillPopupViewHelper;
 struct Suggestion;
 
 // This interface provides data to an AutofillPopupView.
@@ -33,18 +34,10 @@ class AutofillPopupController : public AutofillPopupViewDelegate {
   // Accepts the suggestion at |index|.
   virtual void AcceptSuggestion(size_t index) = 0;
 
-  // Gets the resource value for the given resource, returning -1 if the
-  // resource isn't recognized.
-  virtual int GetIconResourceID(const base::string16& resource_name) const = 0;
-
   // Returns true if the given index refers to an element that is a warning
   // rather than an Autofill suggestion.
   virtual bool IsWarning(size_t index) const = 0;
 
-  // Returns the bounds of the item at |index| in the popup, relative to
-  // the top left of the popup.
-  virtual gfx::Rect GetRowBounds(size_t index) = 0;
-
   // Returns the number of lines of data that there are.
   virtual size_t GetLineCount() const = 0;
 
@@ -73,6 +66,8 @@ class AutofillPopupController : public AutofillPopupViewDelegate {
   // hovered or has keyboard focus.
   virtual int selected_line() const = 0;
 
+  virtual AutofillPopupViewHelper* view_helper() = 0;

[Evan Stade, 2016/01/20 04:51:17]

can this be const and return const ref?

[Mathieu, 2016/01/20 17:57:44]

Done.

+
  protected:
   ~AutofillPopupController() override {}
 };