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"
@@ skipping 118 matching lines @@
     return site_identity_details_;
   }
 
   base::string16 organization_name() const {
     return organization_name_;
   }
 
   // SiteDataObserver implementation.
   void OnSiteDataAccessed() override;
 
+  void DoNotShowInfoBar() { show_info_bar_ = false; }

[felt, 2015/08/25 18:20:08]

nit: should this be a setter for show_info_bar_ instead?

+
  private:
   // Initializes the |WebsiteSettings|.
   void Init(Profile* profile,
             const GURL& url,
             const content::SSLStatus& ssl);
 
   // 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 flag that controls whether an infobar is displayed after the website
   // settings UI is closed or not.
   bool show_info_bar_;
 
@@ skipping 54 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_