Merge 98285 - [Mac] Keep the page-info-bubble controller alive until done with layout.

chrome/browser/ui/cocoa/page_info_bubble_controller.mm

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/page_info_bubble_controller.h"
 
 #include "base/message_loop.h"
 #include "base/sys_string_conversions.h"
 #include "base/task.h"
 #include "chrome/browser/certificate_viewer.h"
@@ skipping 110 matching lines @@
         1000 /* milliseconds */);
   }
 
   // Sets the controller.
   void set_controller(PageInfoBubbleController* controller) {
     controller_ = controller;
   }
 
  private:
   void PerformLayout() {
+    // If the window is animating closed when this is called, the
+    // animation could be holding the last reference to |controller_|
+    // (and thus |this|).  Pin it until the task is completed.
+    scoped_nsobject<PageInfoBubbleController> keep_alive([controller_ retain]);
     [controller_ performLayout];
   }
 
   PageInfoBubbleController* controller_;  // weak
 
   // Factory that vends RunnableMethod tasks for scheduling layout.
   ScopedRunnableMethodFactory<PageInfoModelBubbleBridge> task_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PageInfoModelBubbleBridge);
 };
@@ skipping 326 matching lines @@
     LocationBarViewMac* locationBar = [controller locationBarBridge];
     if (locationBar) {
       NSPoint bubblePoint = locationBar->GetPageInfoBubblePoint();
       origin = [parent convertBaseToScreen:bubblePoint];
     }
   }
   return origin;
 }
 
 @end