Fix UAF in Origin Info Bubble and permission settings UI.

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/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 "content/public/common/signed_certificate_timestamp_id_and_status.h"
 #include "url/gurl.h"
 
 namespace content {
 class CertStore;
 struct SSLStatus;
+class WebContents;
 }
 
 class ChromeSSLHostStateDelegate;
-class InfoBarService;
 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 {
@@ skipping 53 matching lines @@
     WEBSITE_SETTINGS_SITE_SETTINGS_OPENED = 9,
     WEBSITE_SETTINGS_COUNT
   };
 
   // Creates a WebsiteSettings for the passed |url| using the given |ssl| status
   // object to determine the status of the site's connection. The
   // |WebsiteSettings| takes ownership of the |ui|.
   WebsiteSettings(WebsiteSettingsUI* ui,
                   Profile* profile,
                   TabSpecificContentSettings* tab_specific_content_settings,
-                  InfoBarService* infobar_service,
+                  content::WebContents* web_contents,
                   const GURL& url,
                   const content::SSLStatus& ssl,
                   content::CertStore* cert_store);
   ~WebsiteSettings() override;
 
   void RecordWebsiteSettingsAction(WebsiteSettingsAction action);
 
   // This method is called when ever a permission setting is changed.
   void OnSitePermissionChanged(ContentSettingsType type,
                                ContentSetting value);
@@ skipping 39 matching lines @@
   // Sets (presents) the information about the site's permissions in the |ui_|.
   void PresentSitePermissions();
 
   // Sets (presents) the information about the site's data in the |ui_|.
   void PresentSiteData();
 
   // 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, popup, plugin, etc.  permissions) and site specific
+  // 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_;
 
-  // The infobar service of the active tab.
-  InfoBarService* infobar_service_;
+  // The WebContents of the active tab.
+  content::WebContents* web_contents_;
 
   // 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.
@@ skipping 49 matching lines @@
   // Service for managing SSL error page bypasses. Used to revoke bypass
   // decisions by users.
   ChromeSSLHostStateDelegate* chrome_ssl_host_state_delegate_;
 
   bool did_revoke_user_ssl_decisions_;
 
   DISALLOW_COPY_AND_ASSIGN(WebsiteSettings);
 };
 
 #endif  // CHROME_BROWSER_UI_WEBSITE_SETTINGS_WEBSITE_SETTINGS_H_