Fix UAF in Origin Info Bubble and permission settings UI.

chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h

 // Copyright 2014 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 <Cocoa/Cocoa.h>
 
 #include "base/mac/scoped_nsobject.h"
 #include "base/memory/scoped_ptr.h"
 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
+#include "content/public/browser/web_contents_observer.h"
 
 class WebsiteSettingsUIBridge;
 
 namespace content {
 class WebContents;
 }
 
 // This NSWindowController subclass manages the InfoBubbleWindow and view that
 // are displayed when the user clicks the favicon or security lock icon.
 //
-// TODO(palmer, sashab): Normalize all WebsiteSettings*, SiteSettings*,
-// PageInfo*, et c. to OriginInfo*.
+// TODO(palmer): Normalize all WebsiteSettings*, SiteSettings*, PageInfo*, et c.
+// to OriginInfo*.
 @interface WebsiteSettingsBubbleController : BaseBubbleController {
  @private
   content::WebContents* webContents_;
 
   base::scoped_nsobject<NSView> contentView_;
   base::scoped_nsobject<NSSegmentedControl> segmentedControl_;
   base::scoped_nsobject<NSTabView> tabView_;
 
   // Displays the web site identity.
   NSTextField* identityField_;
@@ skipping 59 matching lines @@
             isInternalPage:(BOOL)isInternalPage;
 
 // Return the default width of the window. It may be wider to fit the content.
 // This may be overriden by a subclass for testing purposes.
 - (CGFloat)defaultWindowWidth;
 
 @end
 
 // Provides a bridge between the WebSettingsUI C++ interface and the Cocoa
 // implementation in WebsiteSettingsBubbleController.
-class WebsiteSettingsUIBridge : public WebsiteSettingsUI {
+class WebsiteSettingsUIBridge : public content::WebContentsObserver,
+                                public WebsiteSettingsUI {
  public:
-  WebsiteSettingsUIBridge();
+  explicit WebsiteSettingsUIBridge(content::WebContents* web_contents);
   ~WebsiteSettingsUIBridge() override;
 
   // Creates a |WebsiteSettingsBubbleController| and displays the UI. |parent|
   // is the currently active window. |profile| points to the currently active
   // profile. |web_contents| points to the WebContents that wraps the currently
   // active tab. |url| is the GURL of the currently active tab. |ssl| is the
   // |SSLStatus| of the connection to the website in the currently active tab.
   static void Show(gfx::NativeWindow parent,
                    Profile* profile,
                    content::WebContents* web_contents,
                    const GURL& url,
                    const content::SSLStatus& ssl);
 
   void set_bubble_controller(
       WebsiteSettingsBubbleController* bubble_controller);
 
+  // WebContentsObserver implementation.
+  void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
+
   // WebsiteSettingsUI implementations.
   void SetCookieInfo(const CookieInfoList& cookie_info_list) override;
   void SetPermissionInfo(
       const PermissionInfoList& permission_info_list) override;
   void SetIdentityInfo(const IdentityInfo& identity_info) override;
   void SetSelectedTab(TabId tab_id) override;
 
  private:
+  // The WebContents the bubble UI is attached to.
+  content::WebContents* web_contents_;
+
   // The Cocoa controller for the bubble UI.
   WebsiteSettingsBubbleController* bubble_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsUIBridge);
 };