Fix UAF in Origin Info Bubble and permission settings UI.

chrome/browser/ui/views/website_settings/website_settings_popup_view.h

 // Copyright (c) 2012 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/ui/views/website_settings/permission_selector_view_observer.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
+#include "content/public/browser/web_contents_observer.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/controls/tabbed_pane/tabbed_pane_listener.h"
 
 class GURL;
 class PopupHeaderView;
 class Profile;
 
 namespace content {
 struct SSLStatus;
 class WebContents;
 }
 
 namespace views {
 class LabelButton;
 class Link;
 class TabbedPane;
 class Widget;
 }
 
 // The views implementation of the website settings UI.
-class WebsiteSettingsPopupView
-    : public PermissionSelectorViewObserver,
-      public views::BubbleDelegateView,
-      public views::ButtonListener,
-      public views::LinkListener,
-      public views::TabbedPaneListener,
-      public WebsiteSettingsUI {
+class WebsiteSettingsPopupView : public content::WebContentsObserver,
+                                 public PermissionSelectorViewObserver,
+                                 public views::BubbleDelegateView,
+                                 public views::ButtonListener,
+                                 public views::LinkListener,
+                                 public views::TabbedPaneListener,
+                                 public WebsiteSettingsUI {
  public:
   ~WebsiteSettingsPopupView() override;
 
   // If |anchor_view| is null, |anchor_rect| is used to anchor the bubble.
   static void ShowPopup(views::View* anchor_view,
                         const gfx::Rect& anchor_rect,
                         Profile* profile,
                         content::WebContents* web_contents,
                         const GURL& url,
                         const content::SSLStatus& ssl);
 
   static bool IsPopupShowing();
 
  private:
   WebsiteSettingsPopupView(views::View* anchor_view,
                            gfx::NativeView parent_window,
                            Profile* profile,
                            content::WebContents* web_contents,
                            const GURL& url,
                            const content::SSLStatus& ssl);
 
+  // WebContentsObserver implementation.
+  void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override;
+
   // PermissionSelectorViewObserver implementation.
   void OnPermissionChanged(
       const WebsiteSettingsUI::PermissionInfo& permission) override;
 
   // views::BubbleDelegateView implementation.
   void OnWidgetDestroying(views::Widget* widget) override;
 
   // views::ButtonListener implementation.
   void ButtonPressed(views::Button* button, const ui::Event& event) override;
 
@@ skipping 99 matching lines @@
   views::Link* site_settings_link_;
 
   views::View* connection_info_content_;
 
   base::WeakPtrFactory<WebsiteSettingsPopupView> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_WEBSITE_SETTINGS_WEBSITE_SETTINGS_POPUP_VIEW_H_