Merging r55430 to the M6 branch:...

chrome/browser/views/download_item_view.h

Index: chrome/browser/views/download_item_view.h
===================================================================
--- chrome/browser/views/download_item_view.h	(revision 55436)
+++ chrome/browser/views/download_item_view.h	(working copy)
@@ -255,6 +255,11 @@
   // The currently running download context menu.
   scoped_ptr<DownloadShelfContextMenuWin> context_menu_;
 
+  // If non-NULL, set to true when this object is deleted.
+  // (Used when showing the context menu as it runs an inner message loop that
+  // might delete us).
+  bool* deleted_;
+
   DISALLOW_COPY_AND_ASSIGN(DownloadItemView);
 };