Create a new autocomplete popup for touch. This CL depends on

chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h

Index: chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h
diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h
index f6e3177d25c1799c7982e720b273e8d93a71702a..12088c7486430f2a1d3cb7a2486a300c5db56879 100644
--- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h
+++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h
@@ -30,6 +30,7 @@ class BubbleBorder;
 class Profile;
 
 namespace gfx {
+class CanvasSkia;
 class Insets;
 }
 
@@ -68,10 +69,9 @@ class AutocompletePopupContentsView : public views::View,
 
   // Overridden from views::View:
   virtual void OnPaint(gfx::Canvas* canvas);
-  virtual void PaintChildren(gfx::Canvas* canvas) {
-    // We paint our children inside OnPaint().
-  }
+  virtual void PaintChildren(gfx::CanvasSkia* canvas);
   virtual void Layout();
+  virtual void LayoutChildren();
   virtual void OnMouseEntered(const views::MouseEvent& event);
   virtual void OnMouseMoved(const views::MouseEvent& event);
   virtual void OnMouseExited(const views::MouseEvent& event);
@@ -89,6 +89,11 @@ class AutocompletePopupContentsView : public views::View,
       const gfx::Font& font,
       const gfx::Font& bold_font);
 
+  scoped_ptr<AutocompletePopupModel> model_;
+
+  // The "Opt-in to Instant" promo view, if there is one.
+  views::View* opt_in_view_;
+
  private:
 #if defined(OS_WIN)
   typedef AutocompletePopupWin AutocompletePopupClass;
@@ -135,9 +140,6 @@ class AutocompletePopupContentsView : public views::View,
   // deleted, or without our knowledge.
   base::WeakPtr<AutocompletePopupClass> popup_;
 
-  // The provider of our result set.
-  scoped_ptr<AutocompletePopupModel> model_;
-
   // The edit view that invokes us.
   AutocompleteEditView* edit_view_;
 
@@ -168,9 +170,6 @@ class AutocompletePopupContentsView : public views::View,
   gfx::Rect start_bounds_;
   gfx::Rect target_bounds_;
 
-  // If non-NULL the instant opt-in-view is visible.
-  views::View* opt_in_view_;
-
   DISALLOW_COPY_AND_ASSIGN(AutocompletePopupContentsView);
 };