Fix a use-after-free in WebsiteSettings::OnUIClosing.

chrome/browser/ui/website_settings/website_settings.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_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_
 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_
 
 #include "base/macros.h"
 #include "base/strings/string16.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "components/security_state/security_state_model.h"
+#include "content/public/browser/web_contents_observer.h"
 #include "url/gurl.h"
 
 namespace content {
 class WebContents;
 }
 
 namespace net {
 class X509Certificate;
 }
 
 class ChromeSSLHostStateDelegate;
 class ChooserContextBase;
 class HostContentSettingsMap;
 class Profile;
 class WebsiteSettingsUI;
 
 // The |WebsiteSettings| provides information about a website's permissions,
 // connection state and its identity. It owns a UI that displays the
 // information and allows users to change the permissions. |WebsiteSettings|
 // objects must be created on the heap. They destroy themselves after the UI is
 // closed.
-class WebsiteSettings : public TabSpecificContentSettings::SiteDataObserver {
+class WebsiteSettings : public TabSpecificContentSettings::SiteDataObserver,
+                        public content::WebContentsObserver {
  public:
   // TODO(palmer): Figure out if it is possible to unify SiteConnectionStatus
   // and SiteIdentityStatus.
   //
   // Status of a connection to a website.
   enum SiteConnectionStatus {
     SITE_CONNECTION_STATUS_UNKNOWN = 0,  // No status available.
     SITE_CONNECTION_STATUS_ENCRYPTED,    // Connection is encrypted.
     SITE_CONNECTION_STATUS_INSECURE_PASSIVE_SUBRESOURCE,  // Non-secure passive
                                                           // content.
@@ skipping 124 matching lines @@
   // Sets (presents) the information about the site's identity and connection
   // in the |ui_|.
   void PresentSiteIdentity();
 
   // The website settings UI displays information and controls for site-
   // specific data (local stored objects like cookies), site-specific
   // permissions (location, pop-up, plugin, etc. permissions) and site-specific
   // information (identity, connection status, etc.).
   WebsiteSettingsUI* ui_;
 
-#if !defined(OS_ANDROID)
-  // The WebContents of the active tab.
-  content::WebContents* web_contents_;
-#endif
-
   // The flag that controls whether an infobar is displayed after the website
   // settings UI is closed or not.
   bool show_info_bar_;
 
   // The Omnibox URL of the website for which to display site permissions and
   // site information.
   GURL site_url_;
 
   // Status of the website's identity verification check.
   SiteIdentityStatus site_identity_status_;
@@ skipping 41 matching lines @@
   ChromeSSLHostStateDelegate* chrome_ssl_host_state_delegate_;
 
   bool did_revoke_user_ssl_decisions_;
 
   Profile* profile_;
 
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettings);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_