Merge crash fix to 3.0....

chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h

Index: chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h
===================================================================
--- chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h	(revision 31682)
+++ chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h	(working copy)
@@ -81,6 +81,10 @@
   virtual void Layout();
 
  private:
+#if defined(OS_WIN)
+  typedef AutocompletePopupWin AutocompletePopupClass;
+#endif
+
   // Returns true if the model has a match at the specified index.
   bool HasMatchAt(size_t index) const;
 
@@ -97,10 +101,8 @@
   // Makes the contents of the canvas slightly transparent.
   void MakeCanvasTransparent(gfx::Canvas* canvas);
 
-#if defined(OS_WIN)
   // The popup that contains this view.
-  scoped_ptr<AutocompletePopupWin> popup_;
-#endif
+  scoped_ptr<AutocompletePopupClass> popup_;
 
   // The provider of our result set.
   scoped_ptr<AutocompletePopupModel> model_;
Property changes on: chrome\browser\views\autocomplete\autocomplete_popup_contents_view.h
___________________________________________________________________
Deleted: svn:mergeinfo
   Reverse-merged /branches/chrome_webkit_merge_branch/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h:r69-2775
   Reverse-merged /trunk/src/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.h:r21322,25568