ContentSettingBubbleModel: ensure destruction on WebContentsDestroyed

ContentSettingBubbleContents owns the underlying bubble model. It is
also a WebContentsObserver. This CL destroys the bubble model in
WebContentsDestroyed, which allows the model to avoid paranoid
null checking throughout the code.

In the process, we also remove:
1. Notification observation about profile / web contents destruction.
   The profile should be alive as long as the web contents.

2. Storing the profile directly and accessing the raw ptr. Instead,
   just pull it off the web contents.

One subtle thing about this patch. On WebContentsDestroyed, we do not
synchronously destroy the underlying ContentSettingBubbleContents,
instead, we synchronously hide it and post a task which actually
deletes it. This means we need to be careful about properly null
checking the content_setting_bubble_model_. Thankfully, we can assume
that event listeners are not invoked on hidden widgets.

Bug: None
Change-Id: I0a1ff38a705ace8a9898a4c89f81d51d8474b4da
Reviewed-on: https://chromium-review.googlesource.com/c/1334097
Commit-Queue: Charlie Harrison <csharrison@chromium.org>
Reviewed-by: Balazs Engedy <engedy@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Robert Liao <robliao@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610852}

chrome/browser/ui/content_settings/content_setting_bubble_model.cc

@@ -151,9 +151,8 @@ void SetAllowRunningInsecureContent(content::RenderFrameHost* frame) {
 ContentSettingSimpleBubbleModel::ContentSettingSimpleBubbleModel(
     Delegate* delegate,
     WebContents* web_contents,
-    Profile* profile,
     ContentSettingsType content_type)
-    : ContentSettingBubbleModel(delegate, web_contents, profile),
+    : ContentSettingBubbleModel(delegate, web_contents),
       content_type_(content_type) {
   // Notifications do not have a bubble.
   DCHECK_NE(content_type, CONTENT_SETTINGS_TYPE_NOTIFICATIONS);
@@ -170,9 +169,7 @@ ContentSettingSimpleBubbleModel*
 
 void ContentSettingSimpleBubbleModel::SetTitle() {
   TabSpecificContentSettings* content_settings =
-      web_contents()
-          ? TabSpecificContentSettings::FromWebContents(web_contents())
-          : nullptr;
+      TabSpecificContentSettings::FromWebContents(web_contents());
 
   static const ContentSettingsTypeIdEntry kBlockedTitleIDs[] = {
       {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_TITLE},
@@ -195,7 +192,7 @@ void ContentSettingSimpleBubbleModel::SetTitle() {
   };
   const ContentSettingsTypeIdEntry* title_ids = kBlockedTitleIDs;
   size_t num_title_ids = arraysize(kBlockedTitleIDs);
-  if (content_settings && content_settings->IsContentAllowed(content_type()) &&
+  if (content_settings->IsContentAllowed(content_type()) &&
       !content_settings->IsContentBlocked(content_type())) {
     title_ids = kAccessedTitleIDs;
     num_title_ids = arraysize(kAccessedTitleIDs);
@@ -207,9 +204,7 @@ void ContentSettingSimpleBubbleModel::SetTitle() {
 
 void ContentSettingSimpleBubbleModel::SetMessage() {
   TabSpecificContentSettings* content_settings =
-      web_contents()
-          ? TabSpecificContentSettings::FromWebContents(web_contents())
-          : nullptr;
+      TabSpecificContentSettings::FromWebContents(web_contents());
 
   static const ContentSettingsTypeIdEntry kBlockedMessageIDs[] = {
       {CONTENT_SETTINGS_TYPE_COOKIES, IDS_BLOCKED_COOKIES_MESSAGE},
@@ -231,7 +226,7 @@ void ContentSettingSimpleBubbleModel::SetMessage() {
   };
   const ContentSettingsTypeIdEntry* message_ids = kBlockedMessageIDs;
   size_t num_message_ids = arraysize(kBlockedMessageIDs);
-  if (content_settings && content_settings->IsContentAllowed(content_type()) &&
+  if (content_settings->IsContentAllowed(content_type()) &&
       !content_settings->IsContentBlocked(content_type())) {
     message_ids = kAccessedMessageIDs;
     num_message_ids = arraysize(kAccessedMessageIDs);
@@ -281,8 +276,7 @@ class ContentSettingMixedScriptBubbleModel
     : public ContentSettingSimpleBubbleModel {
  public:
   ContentSettingMixedScriptBubbleModel(Delegate* delegate,
-                                       WebContents* web_contents,
-                                       Profile* profile);
+                                       WebContents* web_contents);
 
   ~ContentSettingMixedScriptBubbleModel() override {}
 
@@ -298,11 +292,9 @@ class ContentSettingMixedScriptBubbleModel
 
 ContentSettingMixedScriptBubbleModel::ContentSettingMixedScriptBubbleModel(
     Delegate* delegate,
-    WebContents* web_contents,
-    Profile* profile)
+    WebContents* web_contents)
     : ContentSettingSimpleBubbleModel(delegate,
                                       web_contents,
-                                      profile,
                                       CONTENT_SETTINGS_TYPE_MIXEDSCRIPT) {
   content_settings::RecordMixedScriptAction(
       content_settings::MIXED_SCRIPT_ACTION_DISPLAYED_BUBBLE);
@@ -321,9 +313,6 @@ void ContentSettingMixedScriptBubbleModel::OnLearnMoreClicked() {
 
 void ContentSettingMixedScriptBubbleModel::OnCustomLinkClicked() {
   DCHECK(rappor_service());
-  if (!web_contents())
-    return;
-
   MixedContentSettingsTabHelper* mixed_content_settings =
       MixedContentSettingsTabHelper::FromWebContents(web_contents());
   if (mixed_content_settings) {
@@ -365,11 +354,9 @@ enum RPHState {
 ContentSettingRPHBubbleModel::ContentSettingRPHBubbleModel(
     Delegate* delegate,
     WebContents* web_contents,
-    Profile* profile,
     ProtocolHandlerRegistry* registry)
     : ContentSettingSimpleBubbleModel(delegate,
                                       web_contents,
-                                      profile,
                                       CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS),
       registry_(registry),
       pending_handler_(ProtocolHandler::EmptyProtocolHandler()),
@@ -422,9 +409,6 @@ ContentSettingRPHBubbleModel::ContentSettingRPHBubbleModel(
 ContentSettingRPHBubbleModel::~ContentSettingRPHBubbleModel() {}
 
 void ContentSettingRPHBubbleModel::CommitChanges() {
-  if (!web_contents())
-    return;
-
   PerformActionForSelectedItem();
 
   // The user has one chance to deal with the RPH content setting UI,
@@ -438,9 +422,6 @@ void ContentSettingRPHBubbleModel::CommitChanges() {
 }
 
 void ContentSettingRPHBubbleModel::RegisterProtocolHandler() {
-  if (!web_contents())
-    return;
-
   // A no-op if the handler hasn't been ignored, but needed in case the user
   // selects sequences like register/ignore/register.
   registry_->RemoveIgnoredHandler(pending_handler_);
@@ -451,9 +432,6 @@ void ContentSettingRPHBubbleModel::RegisterProtocolHandler() {
 }
 
 void ContentSettingRPHBubbleModel::UnregisterProtocolHandler() {
-  if (!web_contents())
-    return;
-
   registry_->OnDenyRegisterProtocolHandler(pending_handler_);
   auto* settings = TabSpecificContentSettings::FromWebContents(web_contents());
   settings->set_pending_protocol_handler_setting(CONTENT_SETTING_BLOCK);
@@ -461,9 +439,6 @@ void ContentSettingRPHBubbleModel::UnregisterProtocolHandler() {
 }
 
 void ContentSettingRPHBubbleModel::IgnoreProtocolHandler() {
-  if (!web_contents())
-    return;
-
   registry_->OnIgnoreRegisterProtocolHandler(pending_handler_);
   auto* settings = TabSpecificContentSettings::FromWebContents(web_contents());
   settings->set_pending_protocol_handler_setting(CONTENT_SETTING_DEFAULT);
@@ -495,8 +470,7 @@ class ContentSettingMidiSysExBubbleModel
     : public ContentSettingSimpleBubbleModel {
  public:
   ContentSettingMidiSysExBubbleModel(Delegate* delegate,
-                                     WebContents* web_contents,
-                                     Profile* profile);
+                                     WebContents* web_contents);
   ~ContentSettingMidiSysExBubbleModel() override {}
 
  private:
@@ -509,11 +483,9 @@ class ContentSettingMidiSysExBubbleModel
 
 ContentSettingMidiSysExBubbleModel::ContentSettingMidiSysExBubbleModel(
     Delegate* delegate,
-    WebContents* web_contents,
-    Profile* profile)
+    WebContents* web_contents)
     : ContentSettingSimpleBubbleModel(delegate,
                                       web_contents,
-                                      profile,
                                       CONTENT_SETTINGS_TYPE_MIDI_SYSEX) {
   SetDomainsAndCustomLink();
 }
@@ -557,8 +529,6 @@ void ContentSettingMidiSysExBubbleModel::SetDomainsAndCustomLink() {
 }
 
 void ContentSettingMidiSysExBubbleModel::OnCustomLinkClicked() {
-  if (!web_contents())
-    return;
   // Reset this embedder's entry to default for each of the requesting
   // origins currently on the page.
   const GURL& embedder_url = web_contents()->GetURL();
@@ -567,10 +537,10 @@ void ContentSettingMidiSysExBubbleModel::OnCustomLinkClicked() {
   const ContentSettingsUsagesState::StateMap& state_map =
       content_settings->midi_usages_state().state_map();
   HostContentSettingsMap* map =
-      HostContentSettingsMapFactory::GetForProfile(profile());
+      HostContentSettingsMapFactory::GetForProfile(GetProfile());
   for (const std::pair<GURL, ContentSetting>& map_entry : state_map) {
     PermissionUtil::ScopedRevocationReporter(
-        profile(), map_entry.first, embedder_url,
+        GetProfile(), map_entry.first, embedder_url,
         CONTENT_SETTINGS_TYPE_MIDI_SYSEX, PermissionSourceUI::PAGE_ACTION);
     map->SetContentSettingDefaultScope(map_entry.first, embedder_url,
                                        CONTENT_SETTINGS_TYPE_MIDI_SYSEX,
@@ -585,7 +555,6 @@ class ContentSettingDomainListBubbleModel
  public:
   ContentSettingDomainListBubbleModel(Delegate* delegate,
                                       WebContents* web_contents,
-                                      Profile* profile,
                                       ContentSettingsType content_type);
   ~ContentSettingDomainListBubbleModel() override {}
 
@@ -600,11 +569,9 @@ class ContentSettingDomainListBubbleModel
 ContentSettingDomainListBubbleModel::ContentSettingDomainListBubbleModel(
     Delegate* delegate,
     WebContents* web_contents,
-    Profile* profile,
     ContentSettingsType content_type)
     : ContentSettingSimpleBubbleModel(delegate,
                                       web_contents,
-                                      profile,
                                       content_type) {
   DCHECK_EQ(CONTENT_SETTINGS_TYPE_GEOLOCATION, content_type)
       << "SetDomains currently only supports geolocation content type";
@@ -650,8 +617,6 @@ void ContentSettingDomainListBubbleModel::SetDomainsAndCustomLink() {
 }
 
 void ContentSettingDomainListBubbleModel::OnCustomLinkClicked() {
-  if (!web_contents())
-    return;
   // Reset this embedder's entry to default for each of the requesting
   // origins currently on the page.
   const GURL& embedder_url = web_contents()->GetURL();
@@ -660,10 +625,10 @@ void ContentSettingDomainListBubbleModel::OnCustomLinkClicked() {
   const ContentSettingsUsagesState::StateMap& state_map =
       content_settings->geolocation_usages_state().state_map();
   HostContentSettingsMap* map =
-      HostContentSettingsMapFactory::GetForProfile(profile());
+      HostContentSettingsMapFactory::GetForProfile(GetProfile());
   for (const std::pair<GURL, ContentSetting>& map_entry : state_map) {
     PermissionUtil::ScopedRevocationReporter(
-        profile(), map_entry.first, embedder_url,
+        GetProfile(), map_entry.first, embedder_url,
         CONTENT_SETTINGS_TYPE_GEOLOCATION, PermissionSourceUI::PAGE_ACTION);
     map->SetContentSettingDefaultScope(map_entry.first, embedder_url,
                                        CONTENT_SETTINGS_TYPE_GEOLOCATION,
@@ -676,8 +641,7 @@ void ContentSettingDomainListBubbleModel::OnCustomLinkClicked() {
 class ContentSettingPluginBubbleModel : public ContentSettingSimpleBubbleModel {
  public:
   ContentSettingPluginBubbleModel(Delegate* delegate,
-                                  WebContents* web_contents,
-                                  Profile* profile);
+                                  WebContents* web_contents);
 
  private:
   void OnLearnMoreClicked() override;
@@ -690,17 +654,15 @@ class ContentSettingPluginBubbleModel : public ContentSettingSimpleBubbleModel {
 
 ContentSettingPluginBubbleModel::ContentSettingPluginBubbleModel(
     Delegate* delegate,
-    WebContents* web_contents,
-    Profile* profile)
+    WebContents* web_contents)
     : ContentSettingSimpleBubbleModel(delegate,
                                       web_contents,
-                                      profile,
                                       CONTENT_SETTINGS_TYPE_PLUGINS) {
   const GURL& url = web_contents->GetURL();
   bool managed_by_user =
-      GetSettingManagedByUser(url, content_type(), profile, nullptr);
+      GetSettingManagedByUser(url, content_type(), GetProfile(), nullptr);
   HostContentSettingsMap* map =
-      HostContentSettingsMapFactory::GetForProfile(profile);
+      HostContentSettingsMapFactory::GetForProfile(GetProfile());
   ContentSetting setting = PluginUtils::GetFlashPluginContentSetting(
       map, url::Origin::Create(url), url, nullptr);
 
@@ -721,7 +683,6 @@ ContentSettingPluginBubbleModel::ContentSettingPluginBubbleModel(
     // Disable the "Run all plugins this time" link if the user already clicked
     // on the link and ran all plugins.
     set_custom_link_enabled(
-        web_contents &&
         TabSpecificContentSettings::FromWebContents(web_contents)
             ->load_plugins_link_enabled());
   }
@@ -749,10 +710,6 @@ void ContentSettingPluginBubbleModel::OnCustomLinkClicked() {
 }
 
 void ContentSettingPluginBubbleModel::RunPluginsOnPage() {
-  // Web contents can be NULL if the tab was closed while the plugins
-  // settings bubble is visible.
-  if (!web_contents())
-    return;
 #if BUILDFLAG(ENABLE_PLUGINS)
   // TODO(bauerb): We should send the identifiers of blocked plugins here.
   ChromePluginServiceFilter::GetInstance()->AuthorizeAllPlugins(
@@ -768,11 +725,9 @@ void ContentSettingPluginBubbleModel::RunPluginsOnPage() {
 ContentSettingSingleRadioGroup::ContentSettingSingleRadioGroup(
     Delegate* delegate,
     WebContents* web_contents,
-    Profile* profile,
     ContentSettingsType content_type)
     : ContentSettingSimpleBubbleModel(delegate,
                                       web_contents,
-                                      profile,
                                       content_type),
       block_setting_(CONTENT_SETTING_BLOCK) {
   SetRadioGroup();
@@ -877,7 +832,7 @@ void ContentSettingSingleRadioGroup::SetRadioGroup() {
 
   ContentSetting setting;
   bool managed_by_user =
-      GetSettingManagedByUser(url, content_type(), profile(), &setting);
+      GetSettingManagedByUser(url, content_type(), GetProfile(), &setting);
   if (setting == CONTENT_SETTING_ALLOW) {
     radio_group.default_item = kAllowButtonIndex;
     // |block_setting_| is already set to |CONTENT_SETTING_BLOCK|.
@@ -891,10 +846,10 @@ void ContentSettingSingleRadioGroup::SetRadioGroup() {
 
 void ContentSettingSingleRadioGroup::SetNarrowestContentSetting(
     ContentSetting setting) {
-  if (!profile())
+  if (!GetProfile())
     return;
 
-  auto* map = HostContentSettingsMapFactory::GetForProfile(profile());
+  auto* map = HostContentSettingsMapFactory::GetForProfile(GetProfile());
   map->SetNarrowestContentSetting(bubble_content().radio_group.url,
                                   bubble_content().radio_group.url,
                                   content_type(), setting);
@@ -905,8 +860,7 @@ void ContentSettingSingleRadioGroup::SetNarrowestContentSetting(
 class ContentSettingCookiesBubbleModel : public ContentSettingSingleRadioGroup {
  public:
   ContentSettingCookiesBubbleModel(Delegate* delegate,
-                                   WebContents* web_contents,
-                                   Profile* profile);
+                                   WebContents* web_contents);
   ~ContentSettingCookiesBubbleModel() override;
 
   // ContentSettingBubbleModel:
@@ -920,11 +874,9 @@ class ContentSettingCookiesBubbleModel : public ContentSettingSingleRadioGroup {
 
 ContentSettingCookiesBubbleModel::ContentSettingCookiesBubbleModel(
     Delegate* delegate,
-    WebContents* web_contents,
-    Profile* profile)
+    WebContents* web_contents)
     : ContentSettingSingleRadioGroup(delegate,
                                      web_contents,
-                                     profile,
                                      CONTENT_SETTINGS_TYPE_COOKIES) {
   set_custom_link_enabled(true);
 }
@@ -934,7 +886,7 @@ ContentSettingCookiesBubbleModel::~ContentSettingCookiesBubbleModel() {}
 void ContentSettingCookiesBubbleModel::CommitChanges() {
   // On some plattforms e.g. MacOS X it is possible to close a tab while the
   // cookies settings bubble is open. This resets the web contents to NULL.
-  if (settings_changed() && web_contents()) {
+  if (settings_changed()) {
     CollectedCookiesInfoBarDelegate::Create(
         InfoBarService::FromWebContents(web_contents()));
   }
@@ -942,8 +894,6 @@ void ContentSettingCookiesBubbleModel::CommitChanges() {
 }
 
 void ContentSettingCookiesBubbleModel::OnCustomLinkClicked() {
-  if (!web_contents())
-    return;
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_COLLECTED_COOKIES_SHOWN,
       content::Source<TabSpecificContentSettings>(
@@ -957,9 +907,7 @@ void ContentSettingCookiesBubbleModel::OnCustomLinkClicked() {
 class ContentSettingPopupBubbleModel : public ContentSettingSingleRadioGroup,
                                        public UrlListManager::Observer {
  public:
-  ContentSettingPopupBubbleModel(Delegate* delegate,
-                                 WebContents* web_contents,
-                                 Profile* profile);
+  ContentSettingPopupBubbleModel(Delegate* delegate, WebContents* web_contents);
   ~ContentSettingPopupBubbleModel() override;
 
   // ContentSettingBubbleModel:
@@ -968,11 +916,6 @@ class ContentSettingPopupBubbleModel : public ContentSettingSingleRadioGroup,
   // PopupBlockerTabHelper::Observer:
   void BlockedUrlAdded(int32_t id, const GURL& url) override;
 
-  // content::NotificationObserver:
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
-
  private:
   void OnListItemClicked(int index, int event_flags) override;
 
@@ -987,16 +930,11 @@ class ContentSettingPopupBubbleModel : public ContentSettingSingleRadioGroup,
 
 ContentSettingPopupBubbleModel::ContentSettingPopupBubbleModel(
     Delegate* delegate,
-    WebContents* web_contents,
-    Profile* profile)
+    WebContents* web_contents)
     : ContentSettingSingleRadioGroup(delegate,
                                      web_contents,
-                                     profile,
                                      CONTENT_SETTINGS_TYPE_POPUPS),
       url_list_observer_(this) {
-  if (!web_contents)
-    return;
-
   set_title(l10n_util::GetStringUTF16(IDS_BLOCKED_POPUPS_TITLE));
 
   // Build blocked popup list.
@@ -1015,25 +953,14 @@ void ContentSettingPopupBubbleModel::BlockedUrlAdded(int32_t id,
   AddListItem(CreateUrlListItem(id, url));
 }
 
-void ContentSettingPopupBubbleModel::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  ContentSettingSingleRadioGroup::Observe(type, source, details);
-  if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED)
-    url_list_observer_.RemoveAll();
-}
-
 void ContentSettingPopupBubbleModel::OnListItemClicked(int index,
                                                        int event_flags) {
-  if (web_contents()) {
   auto* helper = PopupBlockerTabHelper::FromWebContents(web_contents());
   helper->ShowBlockedPopup(item_id_from_item_index(index),
                            ui::DispositionFromEventFlags(event_flags));
   RemoveListItem(index);
   content_settings::RecordPopupsAction(
       content_settings::POPUPS_ACTION_CLICKED_LIST_ITEM_CLICKED);
-  }
 }
 
 void ContentSettingPopupBubbleModel::CommitChanges() {
@@ -1071,16 +998,14 @@ const content::MediaStreamDevice& GetMediaDeviceById(
 
 ContentSettingMediaStreamBubbleModel::ContentSettingMediaStreamBubbleModel(
     Delegate* delegate,
-    WebContents* web_contents,
-    Profile* profile)
-    : ContentSettingBubbleModel(delegate, web_contents, profile),
+    WebContents* web_contents)
+    : ContentSettingBubbleModel(delegate, web_contents),
       state_(TabSpecificContentSettings::MICROPHONE_CAMERA_NOT_ACCESSED) {
   // TODO(msramek): The media bubble has three states - mic only, camera only,
   // and both. There is a lot of duplicated code which does the same thing
   // for camera and microphone separately. Consider refactoring it to avoid
   // duplication.
 
-  DCHECK(profile);
   // Initialize the content settings associated with the individual radio
   // buttons.
   radio_item_setting_[0] = CONTENT_SETTING_ASK;
@@ -1102,11 +1027,6 @@ ContentSettingMediaStreamBubbleModel::ContentSettingMediaStreamBubbleModel(
 ContentSettingMediaStreamBubbleModel::~ContentSettingMediaStreamBubbleModel() {}
 
 void ContentSettingMediaStreamBubbleModel::CommitChanges() {
-  // On some platforms (e.g. MacOS X) it is possible to close a tab while the
-  // media stream bubble is open. This resets the web contents to NULL.
-  if (!web_contents())
-    return;
-
   for (const auto& media_menu : bubble_content().media_menus) {
     const MediaMenu& menu = media_menu.second;
     if (menu.selected_device.id != menu.default_device.id)
@@ -1260,9 +1180,6 @@ void ContentSettingMediaStreamBubbleModel::SetRadioGroup() {
 
 void ContentSettingMediaStreamBubbleModel::UpdateSettings(
     ContentSetting setting) {
-  if (!profile())
-    return;
-
   TabSpecificContentSettings* tab_content_settings =
       TabSpecificContentSettings::FromWebContents(web_contents());
   // The same urls must be used as in other places (e.g. the infobar) in
@@ -1270,19 +1187,20 @@ void ContentSettingMediaStreamBubbleModel::UpdateSettings(
   // TODO(markusheintz): Extract to a helper so that there is only a single
   // place to touch.
   HostContentSettingsMap* map =
-      HostContentSettingsMapFactory::GetForProfile(profile());
+      HostContentSettingsMapFactory::GetForProfile(GetProfile());
   if (MicrophoneAccessed()) {
     PermissionUtil::ScopedRevocationReporter scoped_revocation_reporter(
-        profile(), tab_content_settings->media_stream_access_origin(), GURL(),
-        CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, PermissionSourceUI::PAGE_ACTION);
+        GetProfile(), tab_content_settings->media_stream_access_origin(),
+        GURL(), CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC,
+        PermissionSourceUI::PAGE_ACTION);
     map->SetContentSettingDefaultScope(
         tab_content_settings->media_stream_access_origin(), GURL(),
         CONTENT_SETTINGS_TYPE_MEDIASTREAM_MIC, std::string(), setting);
   }
   if (CameraAccessed()) {
     PermissionUtil::ScopedRevocationReporter scoped_revocation_reporter(
-        profile(), tab_content_settings->media_stream_access_origin(), GURL(),
-        CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
+        GetProfile(), tab_content_settings->media_stream_access_origin(),
+        GURL(), CONTENT_SETTINGS_TYPE_MEDIASTREAM_CAMERA,
         PermissionSourceUI::PAGE_ACTION);
     map->SetContentSettingDefaultScope(
         tab_content_settings->media_stream_access_origin(), GURL(),
@@ -1293,7 +1211,7 @@ void ContentSettingMediaStreamBubbleModel::UpdateSettings(
 void ContentSettingMediaStreamBubbleModel::UpdateDefaultDeviceForType(
     content::MediaStreamType type,
     const std::string& device) {
-  PrefService* prefs = profile()->GetPrefs();
+  PrefService* prefs = GetProfile()->GetPrefs();
   if (type == content::MEDIA_DEVICE_AUDIO_CAPTURE) {
     prefs->SetString(prefs::kDefaultAudioCaptureDevice, device);
   } else {
@@ -1311,7 +1229,7 @@ void ContentSettingMediaStreamBubbleModel::SetMediaMenus() {
       content_settings->media_stream_requested_video_device();
 
   // Add microphone menu.
-  PrefService* prefs = profile()->GetPrefs();
+  PrefService* prefs = GetProfile()->GetPrefs();
   MediaCaptureDevicesDispatcher* dispatcher =
       MediaCaptureDevicesDispatcher::GetInstance();
   const content::MediaStreamDevices& microphones =
@@ -1398,9 +1316,8 @@ void ContentSettingMediaStreamBubbleModel::OnMediaMenuClicked(
 
 ContentSettingSubresourceFilterBubbleModel::
     ContentSettingSubresourceFilterBubbleModel(Delegate* delegate,
-                                               WebContents* web_contents,
-                                               Profile* profile)
-    : ContentSettingBubbleModel(delegate, web_contents, profile) {
+                                               WebContents* web_contents)
+    : ContentSettingBubbleModel(delegate, web_contents) {
   SetTitle();
   SetMessage();
   SetManageText();
@@ -1456,9 +1373,8 @@ ContentSettingSubresourceFilterBubbleModel::AsSubresourceFilterBubbleModel() {
 
 ContentSettingDownloadsBubbleModel::ContentSettingDownloadsBubbleModel(
     Delegate* delegate,
-    WebContents* web_contents,
-    Profile* profile)
-    : ContentSettingBubbleModel(delegate, web_contents, profile) {
+    WebContents* web_contents)
+    : ContentSettingBubbleModel(delegate, web_contents) {
   SetTitle();
   SetManageText();
   SetRadioGroup();
@@ -1467,12 +1383,11 @@ ContentSettingDownloadsBubbleModel::ContentSettingDownloadsBubbleModel(
 ContentSettingDownloadsBubbleModel::~ContentSettingDownloadsBubbleModel() {}
 
 void ContentSettingDownloadsBubbleModel::CommitChanges() {
-  if (profile() &&
-      selected_item() != bubble_content().radio_group.default_item) {
+  if (selected_item() != bubble_content().radio_group.default_item) {
     ContentSetting setting = selected_item() == kAllowButtonIndex
                                  ? CONTENT_SETTING_ALLOW
                                  : CONTENT_SETTING_BLOCK;
-    auto* map = HostContentSettingsMapFactory::GetForProfile(profile());
+    auto* map = HostContentSettingsMapFactory::GetForProfile(GetProfile());
     map->SetNarrowestContentSetting(
         bubble_content().radio_group.url, bubble_content().radio_group.url,
         CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, setting);
@@ -1517,13 +1432,10 @@ void ContentSettingDownloadsBubbleModel::SetRadioGroup() {
   }
   set_radio_group(radio_group);
   set_radio_group_enabled(GetSettingManagedByUser(
-      url, CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, profile(), nullptr));
+      url, CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS, GetProfile(), nullptr));
 }
 
 void ContentSettingDownloadsBubbleModel::SetTitle() {
-  if (!web_contents())
-    return;
-
   DownloadRequestLimiter* download_request_limiter =
       g_browser_process->download_request_limiter();
   DCHECK(download_request_limiter);
@@ -1554,16 +1466,11 @@ void ContentSettingDownloadsBubbleModel::OnManageButtonClicked() {
 // ContentSettingFramebustBlockBubbleModel -------------------------------------
 ContentSettingFramebustBlockBubbleModel::
     ContentSettingFramebustBlockBubbleModel(Delegate* delegate,
-                                            WebContents* web_contents,
-                                            Profile* profile)
+                                            WebContents* web_contents)
     : ContentSettingSingleRadioGroup(delegate,
                                      web_contents,
-                                     profile,
                                      CONTENT_SETTINGS_TYPE_POPUPS),
       url_list_observer_(this) {
-  if (!web_contents)
-    return;
-
   set_title(l10n_util::GetStringUTF16(IDS_REDIRECT_BLOCKED_MESSAGE));
   auto* helper = FramebustBlockTabHelper::FromWebContents(web_contents);
 
@@ -1577,21 +1484,9 @@ ContentSettingFramebustBlockBubbleModel::
 ContentSettingFramebustBlockBubbleModel::
     ~ContentSettingFramebustBlockBubbleModel() = default;
 
-void ContentSettingFramebustBlockBubbleModel::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED)
-    url_list_observer_.RemoveAll();
-  ContentSettingSingleRadioGroup::Observe(type, source, details);
-}
-
 void ContentSettingFramebustBlockBubbleModel::OnListItemClicked(
     int index,
     int event_flags) {
-  if (!web_contents())
-    return;
-
   FramebustBlockTabHelper::FromWebContents(web_contents())
       ->OnBlockedUrlClicked(index);
 }
@@ -1619,45 +1514,46 @@ std::unique_ptr<ContentSettingBubbleModel>
 ContentSettingBubbleModel::CreateContentSettingBubbleModel(
     Delegate* delegate,
     WebContents* web_contents,
-    Profile* profile,
     ContentSettingsType content_type) {
+  DCHECK(web_contents);
   if (content_type == CONTENT_SETTINGS_TYPE_COOKIES) {
-    return std::make_unique<ContentSettingCookiesBubbleModel>(
-        delegate, web_contents, profile);
+    return std::make_unique<ContentSettingCookiesBubbleModel>(delegate,
+                                                              web_contents);
   }
   if (content_type == CONTENT_SETTINGS_TYPE_POPUPS) {
-    return std::make_unique<ContentSettingPopupBubbleModel>(
-        delegate, web_contents, profile);
+    return std::make_unique<ContentSettingPopupBubbleModel>(delegate,
+                                                            web_contents);
   }
   if (content_type == CONTENT_SETTINGS_TYPE_GEOLOCATION) {
     return std::make_unique<ContentSettingDomainListBubbleModel>(
-        delegate, web_contents, profile, content_type);
+        delegate, web_contents, content_type);
   }
   if (content_type == CONTENT_SETTINGS_TYPE_PLUGINS) {
-    return std::make_unique<ContentSettingPluginBubbleModel>(
-        delegate, web_contents, profile);
+    return std::make_unique<ContentSettingPluginBubbleModel>(delegate,
+                                                             web_contents);
   }
   if (content_type == CONTENT_SETTINGS_TYPE_MIXEDSCRIPT) {
-    return std::make_unique<ContentSettingMixedScriptBubbleModel>(
-        delegate, web_contents, profile);
+    return std::make_unique<ContentSettingMixedScriptBubbleModel>(delegate,
+                                                                  web_contents);
   }
   if (content_type == CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS) {
     ProtocolHandlerRegistry* registry =
-        ProtocolHandlerRegistryFactory::GetForBrowserContext(profile);
+        ProtocolHandlerRegistryFactory::GetForBrowserContext(
+            web_contents->GetBrowserContext());
     return std::make_unique<ContentSettingRPHBubbleModel>(
-        delegate, web_contents, profile, registry);
+        delegate, web_contents, registry);
   }
   if (content_type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX) {
-    return std::make_unique<ContentSettingMidiSysExBubbleModel>(
-        delegate, web_contents, profile);
+    return std::make_unique<ContentSettingMidiSysExBubbleModel>(delegate,
+                                                                web_contents);
   }
   if (content_type == CONTENT_SETTINGS_TYPE_AUTOMATIC_DOWNLOADS) {
-    return std::make_unique<ContentSettingDownloadsBubbleModel>(
-        delegate, web_contents, profile);
+    return std::make_unique<ContentSettingDownloadsBubbleModel>(delegate,
+                                                                web_contents);
   }
   if (content_type == CONTENT_SETTINGS_TYPE_ADS) {
     return std::make_unique<ContentSettingSubresourceFilterBubbleModel>(
-        delegate, web_contents, profile);
+        delegate, web_contents);
   }
   if (content_type == CONTENT_SETTINGS_TYPE_IMAGES ||
       content_type == CONTENT_SETTINGS_TYPE_JAVASCRIPT ||
@@ -1666,24 +1562,19 @@ ContentSettingBubbleModel::CreateContentSettingBubbleModel(
       content_type == CONTENT_SETTINGS_TYPE_CLIPBOARD_READ ||
       content_type == CONTENT_SETTINGS_TYPE_SENSORS) {
     return std::make_unique<ContentSettingSingleRadioGroup>(
-        delegate, web_contents, profile, content_type);
+        delegate, web_contents, content_type);
   }
   NOTREACHED() << "No bubble for the content type " << content_type << ".";
   return nullptr;
 }
 
 ContentSettingBubbleModel::ContentSettingBubbleModel(Delegate* delegate,
-                                                     WebContents* web_contents,
-                                                     Profile* profile)
+                                                     WebContents* web_contents)
     : web_contents_(web_contents),
-      profile_(profile),
       owner_(nullptr),
       delegate_(delegate),
       rappor_service_(g_browser_process->rappor_service()) {
-  registrar_.Add(this, content::NOTIFICATION_WEB_CONTENTS_DESTROYED,
-                 content::Source<WebContents>(web_contents));
-  registrar_.Add(this, chrome::NOTIFICATION_PROFILE_DESTROYED,
-                 content::Source<Profile>(profile_));
+  DCHECK(web_contents_);
 }
 
 ContentSettingBubbleModel::~ContentSettingBubbleModel() {
@@ -1711,21 +1602,6 @@ ContentSettingBubbleModel::BubbleContent::BubbleContent() {}
 
 ContentSettingBubbleModel::BubbleContent::~BubbleContent() {}
 
-void ContentSettingBubbleModel::Observe(
-    int type,
-    const content::NotificationSource& source,
-    const content::NotificationDetails& details) {
-  if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {
-    DCHECK_EQ(web_contents_,
-              content::Source<WebContents>(source).ptr());
-    web_contents_ = nullptr;
-  } else {
-    DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type);
-    DCHECK_EQ(profile_, content::Source<Profile>(source).ptr());
-    profile_ = nullptr;
-  }
-}
-
 ContentSettingSimpleBubbleModel*
     ContentSettingBubbleModel::AsSimpleBubbleModel() {
   // In general, bubble models might not inherit from the simple bubble model.
@@ -1753,6 +1629,10 @@ ContentSettingBubbleModel::AsFramebustBlockBubbleModel() {
   return nullptr;
 }
 
+Profile* ContentSettingBubbleModel::GetProfile() const {
+  return Profile::FromBrowserContext(web_contents_->GetBrowserContext());
+}
+
 void ContentSettingBubbleModel::AddListItem(const ListItem& item) {
   bubble_content_.list_items.push_back(item);
   if (owner_)

chrome/browser/ui/content_settings/content_setting_bubble_model.h

@@ -23,8 +23,6 @@
 #include "chrome/common/custom_handlers/protocol_handler.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
 #include "content/public/common/media_stream_request.h"
 #include "ui/gfx/image/image.h"
 #include "url/gurl.h"
@@ -67,7 +65,7 @@ class ContentSettingFramebustBlockBubbleModel;
 
 // This model provides data for ContentSettingBubble, and also controls
 // the action triggered when the allow / block radio buttons are triggered.
-class ContentSettingBubbleModel : public content::NotificationObserver {
+class ContentSettingBubbleModel {
  public:
   typedef ContentSettingBubbleModelDelegate Delegate;
 
@@ -167,20 +165,14 @@ class ContentSettingBubbleModel : public content::NotificationObserver {
   static std::unique_ptr<ContentSettingBubbleModel>
   CreateContentSettingBubbleModel(Delegate* delegate,
                                   content::WebContents* web_contents,
-                                  Profile* profile,
                                   ContentSettingsType content_type);
 
-  ~ContentSettingBubbleModel() override;
+  virtual ~ContentSettingBubbleModel();
 
   const BubbleContent& bubble_content() const { return bubble_content_; }
 
   void set_owner(Owner* owner) { owner_ = owner; }
 
-  // content::NotificationObserver:
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
-
   virtual void OnListItemClicked(int index, int event_flags) {}
   virtual void OnCustomLinkClicked() {}
   virtual void OnManageButtonClicked() {}
@@ -221,13 +213,13 @@ class ContentSettingBubbleModel : public content::NotificationObserver {
   }
 
  protected:
-  ContentSettingBubbleModel(
-      Delegate* delegate,
-      content::WebContents* web_contents,
-      Profile* profile);
+  // |web_contents| must outlive this.
+  ContentSettingBubbleModel(Delegate* delegate,
+                            content::WebContents* web_contents);
 
+  // Should always be non-nullptr.
   content::WebContents* web_contents() const { return web_contents_; }
-  Profile* profile() const { return profile_; }
+  Profile* GetProfile() const;
   Delegate* delegate() const { return delegate_; }
   int selected_item() const { return owner_->GetSelectedRadioOption(); }
 
@@ -274,12 +266,9 @@ class ContentSettingBubbleModel : public content::NotificationObserver {
 
  private:
   content::WebContents* web_contents_;
-  Profile* profile_;
   Owner* owner_;
   Delegate* delegate_;
   BubbleContent bubble_content_;
-  // A registrar for listening for WEB_CONTENTS_DESTROYED notifications.
-  content::NotificationRegistrar registrar_;
   // The service used to record Rappor metrics. Can be set for testing.
   rappor::RapporServiceImpl* rappor_service_;
 
@@ -291,7 +280,6 @@ class ContentSettingSimpleBubbleModel : public ContentSettingBubbleModel {
  public:
   ContentSettingSimpleBubbleModel(Delegate* delegate,
                                   content::WebContents* web_contents,
-                                  Profile* profile,
                                   ContentSettingsType content_type);
 
   ContentSettingsType content_type() { return content_type_; }
@@ -320,7 +308,6 @@ class ContentSettingRPHBubbleModel : public ContentSettingSimpleBubbleModel {
  public:
   ContentSettingRPHBubbleModel(Delegate* delegate,
                                content::WebContents* web_contents,
-                               Profile* profile,
                                ProtocolHandlerRegistry* registry);
   ~ContentSettingRPHBubbleModel() override;
 
@@ -345,8 +332,7 @@ class ContentSettingRPHBubbleModel : public ContentSettingSimpleBubbleModel {
 class ContentSettingMediaStreamBubbleModel : public ContentSettingBubbleModel {
  public:
   ContentSettingMediaStreamBubbleModel(Delegate* delegate,
-                                       content::WebContents* web_contents,
-                                       Profile* profile);
+                                       content::WebContents* web_contents);
 
   ~ContentSettingMediaStreamBubbleModel() override;
 
@@ -402,9 +388,9 @@ class ContentSettingMediaStreamBubbleModel : public ContentSettingBubbleModel {
 class ContentSettingSubresourceFilterBubbleModel
     : public ContentSettingBubbleModel {
  public:
-  ContentSettingSubresourceFilterBubbleModel(Delegate* delegate,
-                                             content::WebContents* web_contents,
-                                             Profile* profile);
+  ContentSettingSubresourceFilterBubbleModel(
+      Delegate* delegate,
+      content::WebContents* web_contents);
 
   ~ContentSettingSubresourceFilterBubbleModel() override;
 
@@ -429,8 +415,7 @@ class ContentSettingSubresourceFilterBubbleModel
 class ContentSettingDownloadsBubbleModel : public ContentSettingBubbleModel {
  public:
   ContentSettingDownloadsBubbleModel(Delegate* delegate,
-                                     content::WebContents* web_contents,
-                                     Profile* profile);
+                                     content::WebContents* web_contents);
   ~ContentSettingDownloadsBubbleModel() override;
 
   // ContentSettingBubbleModel overrides:
@@ -452,7 +437,6 @@ class ContentSettingSingleRadioGroup : public ContentSettingSimpleBubbleModel {
  public:
   ContentSettingSingleRadioGroup(Delegate* delegate,
                                  content::WebContents* web_contents,
-                                 Profile* profile,
                                  ContentSettingsType content_type);
   ~ContentSettingSingleRadioGroup() override;
 
@@ -482,16 +466,10 @@ class ContentSettingFramebustBlockBubbleModel
       public UrlListManager::Observer {
  public:
   ContentSettingFramebustBlockBubbleModel(Delegate* delegate,
-                                          content::WebContents* web_contents,
-                                          Profile* profile);
+                                          content::WebContents* web_contents);
 
   ~ContentSettingFramebustBlockBubbleModel() override;
 
-  // content::NotificationObserver:
-  void Observe(int type,
-               const content::NotificationSource& source,
-               const content::NotificationDetails& details) override;
-
   // ContentSettingBubbleModel:
   void OnListItemClicked(int index, int event_flags) override;
   ContentSettingFramebustBlockBubbleModel* AsFramebustBlockBubbleModel()

chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc

@@ -68,7 +68,7 @@ IN_PROC_BROWSER_TEST_F(ContentSettingBubbleModelMixedScriptTest, MainFrame) {
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
           browser()->content_setting_bubble_model_delegate(),
           browser()->tab_strip_model()->GetActiveWebContents(),
-          browser()->profile(), CONTENT_SETTINGS_TYPE_MIXEDSCRIPT));
+          CONTENT_SETTINGS_TYPE_MIXEDSCRIPT));
   model->OnCustomLinkClicked();
 
   // Wait for reload
@@ -128,7 +128,7 @@ IN_PROC_BROWSER_TEST_F(ContentSettingsMixedScriptIgnoreCertErrorsTest,
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
           browser()->content_setting_bubble_model_delegate(),
           browser()->tab_strip_model()->GetActiveWebContents(),
-          browser()->profile(), CONTENT_SETTINGS_TYPE_MIXEDSCRIPT));
+          CONTENT_SETTINGS_TYPE_MIXEDSCRIPT));
   model->SetRapporServiceImplForTesting(&rappor_service);
   model->OnCustomLinkClicked();
 
@@ -187,8 +187,7 @@ class ContentSettingBubbleModelMediaStreamTest : public InProcessBrowserTest {
             state, std::string(), std::string(), std::string(), std::string());
     std::unique_ptr<ContentSettingBubbleModel> bubble(
         new ContentSettingMediaStreamBubbleModel(
-            browser()->content_setting_bubble_model_delegate(), original_tab,
-            browser()->profile()));
+            browser()->content_setting_bubble_model_delegate(), original_tab));
 
     // Click the manage button, which opens in a new tab or window. Wait until
     // it loads.
@@ -264,7 +263,7 @@ IN_PROC_BROWSER_TEST_F(ContentSettingBubbleModelPopupTest,
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
           browser()->content_setting_bubble_model_delegate(),
           browser()->tab_strip_model()->GetActiveWebContents(),
-          browser()->profile(), CONTENT_SETTINGS_TYPE_POPUPS));
+          CONTENT_SETTINGS_TYPE_POPUPS));
   std::unique_ptr<FakeOwner> owner =
       FakeOwner::Create(*model, kDisallowButtonIndex);
 
@@ -341,7 +340,7 @@ IN_PROC_BROWSER_TEST_F(ContentSettingBubbleModelMixedScriptOopifTest,
   std::unique_ptr<ContentSettingBubbleModel> model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
           browser()->content_setting_bubble_model_delegate(), web_contents,
-          browser()->profile(), CONTENT_SETTINGS_TYPE_MIXEDSCRIPT));
+          CONTENT_SETTINGS_TYPE_MIXEDSCRIPT));
   model->OnCustomLinkClicked();
 
   // Wait for reload and verify that mixed content is allowed.

chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc

@@ -54,8 +54,7 @@ class ContentSettingBubbleModelTest : public ChromeRenderViewHostTestHarness {
                               bool expect_reload_hint) {
     std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
         ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-            NULL, web_contents(), profile(),
-            CONTENT_SETTINGS_TYPE_GEOLOCATION));
+            NULL, web_contents(), CONTENT_SETTINGS_TYPE_GEOLOCATION));
     const ContentSettingBubbleModel::BubbleContent& bubble_content =
         content_setting_bubble_model->bubble_content();
     EXPECT_TRUE(bubble_content.title.empty());
@@ -88,7 +87,7 @@ TEST_F(ContentSettingBubbleModelTest, ImageRadios) {
 
   std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-          NULL, web_contents(), profile(), CONTENT_SETTINGS_TYPE_IMAGES));
+          NULL, web_contents(), CONTENT_SETTINGS_TYPE_IMAGES));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
   EXPECT_FALSE(bubble_content.title.empty());
@@ -107,7 +106,7 @@ TEST_F(ContentSettingBubbleModelTest, Cookies) {
 
   std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-          NULL, web_contents(), profile(), CONTENT_SETTINGS_TYPE_COOKIES));
+          NULL, web_contents(), CONTENT_SETTINGS_TYPE_COOKIES));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
   base::string16 title = bubble_content.title;
@@ -121,7 +120,7 @@ TEST_F(ContentSettingBubbleModelTest, Cookies) {
   content_settings->OnContentAllowed(CONTENT_SETTINGS_TYPE_COOKIES);
   content_setting_bubble_model =
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-          NULL, web_contents(), profile(), CONTENT_SETTINGS_TYPE_COOKIES);
+          NULL, web_contents(), CONTENT_SETTINGS_TYPE_COOKIES);
   const ContentSettingBubbleModel::BubbleContent& bubble_content_2 =
       content_setting_bubble_model->bubble_content();
 
@@ -160,8 +159,7 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamMicAndCamera) {
                                                std::string());
 
   std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
-      new ContentSettingMediaStreamBubbleModel(nullptr, web_contents(),
-                                               profile()));
+      new ContentSettingMediaStreamBubbleModel(nullptr, web_contents()));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
   EXPECT_EQ(bubble_content.title,
@@ -217,8 +215,7 @@ TEST_F(ContentSettingBubbleModelTest, BlockedMediastreamMicAndCamera) {
                                                std::string());
 
   std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
-      new ContentSettingMediaStreamBubbleModel(nullptr, web_contents(),
-                                               profile()));
+      new ContentSettingMediaStreamBubbleModel(nullptr, web_contents()));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
   // Test if the correct radio item is selected for the blocked mediastream
@@ -291,8 +288,7 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamContentBubble) {
                                                std::string());
   {
     std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
-        new ContentSettingMediaStreamBubbleModel(nullptr, web_contents(),
-                                                 profile()));
+        new ContentSettingMediaStreamBubbleModel(nullptr, web_contents()));
     const ContentSettingBubbleModel::BubbleContent& bubble_content =
         content_setting_bubble_model->bubble_content();
     // Test if the correct radio item is selected for the blocked mediastream
@@ -314,8 +310,7 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamContentBubble) {
 
   {
     std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
-        new ContentSettingMediaStreamBubbleModel(nullptr, web_contents(),
-                                                 profile()));
+        new ContentSettingMediaStreamBubbleModel(nullptr, web_contents()));
     const ContentSettingBubbleModel::BubbleContent& bubble_content =
         content_setting_bubble_model->bubble_content();
     // Test that the reload hint is displayed.
@@ -341,8 +336,7 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamContentBubble) {
 
   {
     std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
-        new ContentSettingMediaStreamBubbleModel(nullptr, web_contents(),
-                                                 profile()));
+        new ContentSettingMediaStreamBubbleModel(nullptr, web_contents()));
     const ContentSettingBubbleModel::BubbleContent& bubble_content =
         content_setting_bubble_model->bubble_content();
     // Test that the reload hint is not displayed any more.
@@ -389,8 +383,7 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamContentBubbleMediaMenus) {
                                                std::string());
   {
     std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
-        new ContentSettingMediaStreamBubbleModel(nullptr, web_contents(),
-                                                 profile()));
+        new ContentSettingMediaStreamBubbleModel(nullptr, web_contents()));
     const ContentSettingBubbleModel::BubbleContent& bubble_content =
         content_setting_bubble_model->bubble_content();
     std::unique_ptr<FakeOwner> owner = FakeOwner::Create(
@@ -413,8 +406,7 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamContentBubbleMediaMenus) {
   }
   {
     std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
-        new ContentSettingMediaStreamBubbleModel(nullptr, web_contents(),
-                                                 profile()));
+        new ContentSettingMediaStreamBubbleModel(nullptr, web_contents()));
     const ContentSettingBubbleModel::BubbleContent& bubble_content =
         content_setting_bubble_model->bubble_content();
     std::unique_ptr<FakeOwner> owner = FakeOwner::Create(
@@ -450,8 +442,7 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamContentBubbleMediaMenus) {
 
   {
     std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
-        new ContentSettingMediaStreamBubbleModel(nullptr, web_contents(),
-                                                 profile()));
+        new ContentSettingMediaStreamBubbleModel(nullptr, web_contents()));
     const ContentSettingBubbleModel::BubbleContent& bubble_content =
         content_setting_bubble_model->bubble_content();
     std::unique_ptr<FakeOwner> owner = FakeOwner::Create(
@@ -476,8 +467,7 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamContentBubbleMediaMenus) {
 
   {
     std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
-        new ContentSettingMediaStreamBubbleModel(nullptr, web_contents(),
-                                                 profile()));
+        new ContentSettingMediaStreamBubbleModel(nullptr, web_contents()));
     const ContentSettingBubbleModel::BubbleContent& bubble_content =
         content_setting_bubble_model->bubble_content();
     std::unique_ptr<FakeOwner> owner = FakeOwner::Create(
@@ -500,8 +490,7 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamContentBubbleMediaMenus) {
 
   {
     std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
-        new ContentSettingMediaStreamBubbleModel(nullptr, web_contents(),
-                                                 profile()));
+        new ContentSettingMediaStreamBubbleModel(nullptr, web_contents()));
     const ContentSettingBubbleModel::BubbleContent& bubble_content =
         content_setting_bubble_model->bubble_content();
     std::unique_ptr<FakeOwner> owner = FakeOwner::Create(
@@ -540,8 +529,7 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamMic) {
                                                std::string());
 
   std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
-      new ContentSettingMediaStreamBubbleModel(nullptr, web_contents(),
-                                               profile()));
+      new ContentSettingMediaStreamBubbleModel(nullptr, web_contents()));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
   EXPECT_EQ(bubble_content.title,
@@ -572,8 +560,7 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamMic) {
                                                std::string(),
                                                std::string());
   content_setting_bubble_model.reset(
-      new ContentSettingMediaStreamBubbleModel(
-          nullptr, web_contents(), profile()));
+      new ContentSettingMediaStreamBubbleModel(nullptr, web_contents()));
   const ContentSettingBubbleModel::BubbleContent& new_bubble_content =
       content_setting_bubble_model->bubble_content();
   EXPECT_EQ(new_bubble_content.title,
@@ -615,8 +602,7 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamCamera) {
                                                std::string());
 
   std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
-      new ContentSettingMediaStreamBubbleModel(nullptr, web_contents(),
-                                               profile()));
+      new ContentSettingMediaStreamBubbleModel(nullptr, web_contents()));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
   EXPECT_EQ(bubble_content.title,
@@ -647,8 +633,7 @@ TEST_F(ContentSettingBubbleModelTest, MediastreamCamera) {
                                                std::string(),
                                                std::string());
   content_setting_bubble_model.reset(
-      new ContentSettingMediaStreamBubbleModel(
-          nullptr, web_contents(), profile()));
+      new ContentSettingMediaStreamBubbleModel(nullptr, web_contents()));
   const ContentSettingBubbleModel::BubbleContent& new_bubble_content =
       content_setting_bubble_model->bubble_content();
   EXPECT_EQ(new_bubble_content.title,
@@ -693,8 +678,7 @@ TEST_F(ContentSettingBubbleModelTest, AccumulateMediastreamMicAndCamera) {
                                                std::string());
 
   std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
-      new ContentSettingMediaStreamBubbleModel(nullptr, web_contents(),
-                                               profile()));
+      new ContentSettingMediaStreamBubbleModel(nullptr, web_contents()));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
   EXPECT_EQ(bubble_content.title,
@@ -723,8 +707,7 @@ TEST_F(ContentSettingBubbleModelTest, AccumulateMediastreamMicAndCamera) {
                                                std::string());
 
   content_setting_bubble_model.reset(
-      new ContentSettingMediaStreamBubbleModel(
-          nullptr, web_contents(), profile()));
+      new ContentSettingMediaStreamBubbleModel(nullptr, web_contents()));
   const ContentSettingBubbleModel::BubbleContent& new_bubble_content =
       content_setting_bubble_model->bubble_content();
   EXPECT_EQ(new_bubble_content.title,
@@ -755,7 +738,7 @@ TEST_F(ContentSettingBubbleModelTest, Plugins) {
 
   std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-          NULL, web_contents(), profile(), CONTENT_SETTINGS_TYPE_PLUGINS));
+          NULL, web_contents(), CONTENT_SETTINGS_TYPE_PLUGINS));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
   EXPECT_FALSE(bubble_content.title.empty());
@@ -776,7 +759,7 @@ TEST_F(ContentSettingBubbleModelTest, PepperBroker) {
 
   std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-          NULL, web_contents(), profile(), CONTENT_SETTINGS_TYPE_PPAPI_BROKER));
+          NULL, web_contents(), CONTENT_SETTINGS_TYPE_PPAPI_BROKER));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
 
@@ -793,7 +776,7 @@ TEST_F(ContentSettingBubbleModelTest, PepperBroker) {
   content_settings->OnContentAllowed(CONTENT_SETTINGS_TYPE_PPAPI_BROKER);
   content_setting_bubble_model =
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-          NULL, web_contents(), profile(), CONTENT_SETTINGS_TYPE_PPAPI_BROKER);
+          NULL, web_contents(), CONTENT_SETTINGS_TYPE_PPAPI_BROKER);
   const ContentSettingBubbleModel::BubbleContent& bubble_content_2 =
       content_setting_bubble_model->bubble_content();
 
@@ -849,7 +832,7 @@ TEST_F(ContentSettingBubbleModelTest, FileURL) {
       CONTENT_SETTINGS_TYPE_IMAGES);
   std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-          nullptr, web_contents(), profile(), CONTENT_SETTINGS_TYPE_IMAGES));
+          nullptr, web_contents(), CONTENT_SETTINGS_TYPE_IMAGES));
   base::string16 title =
       content_setting_bubble_model->bubble_content().radio_group.radio_items[0];
   ASSERT_NE(base::string16::npos, title.find(base::UTF8ToUTF16(file_url)));
@@ -865,7 +848,7 @@ TEST_F(ContentSettingBubbleModelTest, RegisterProtocolHandler) {
           "mailto", GURL("http://www.toplevel.example/")));
 
   ContentSettingRPHBubbleModel content_setting_bubble_model(
-      NULL, web_contents(), profile(), NULL);
+      NULL, web_contents(), NULL);
 
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model.bubble_content();
@@ -906,7 +889,7 @@ TEST_F(ContentSettingBubbleModelTest, RPHAllow) {
   content_settings->set_pending_protocol_handler(test_handler);
 
   ContentSettingRPHBubbleModel content_setting_bubble_model(
-      NULL, web_contents(), profile(), &registry);
+      NULL, web_contents(), &registry);
   std::unique_ptr<FakeOwner> owner =
       FakeOwner::Create(content_setting_bubble_model, 0);
 
@@ -971,7 +954,7 @@ TEST_F(ContentSettingBubbleModelTest, RPHDefaultDone) {
   content_settings->set_pending_protocol_handler(test_handler);
 
   ContentSettingRPHBubbleModel content_setting_bubble_model(
-      NULL, web_contents(), profile(), &registry);
+      NULL, web_contents(), &registry);
   std::unique_ptr<FakeOwner> owner = FakeOwner::Create(
       content_setting_bubble_model,
       content_setting_bubble_model.bubble_content().radio_group.default_item);
@@ -991,8 +974,7 @@ TEST_F(ContentSettingBubbleModelTest, RPHDefaultDone) {
 
 TEST_F(ContentSettingBubbleModelTest, SubresourceFilter) {
   std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
-      new ContentSettingSubresourceFilterBubbleModel(nullptr, web_contents(),
-                                                     profile()));
+      new ContentSettingSubresourceFilterBubbleModel(nullptr, web_contents()));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
   EXPECT_EQ(bubble_content.title,
@@ -1019,7 +1001,7 @@ TEST_F(ContentSettingBubbleModelTest, PopupBubbleModelListItems) {
   PopupBlockerTabHelper::CreateForWebContents(web_contents());
   std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-          nullptr, web_contents(), profile(), CONTENT_SETTINGS_TYPE_POPUPS));
+          nullptr, web_contents(), CONTENT_SETTINGS_TYPE_POPUPS));
   const auto& list_items =
       content_setting_bubble_model->bubble_content().list_items;
   EXPECT_EQ(0U, list_items.size());
@@ -1048,7 +1030,7 @@ TEST_F(ContentSettingBubbleModelTest, ValidUrl) {
 
   std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-          NULL, web_contents(), profile(), CONTENT_SETTINGS_TYPE_COOKIES));
+          NULL, web_contents(), CONTENT_SETTINGS_TYPE_COOKIES));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
 
@@ -1065,7 +1047,7 @@ TEST_F(ContentSettingBubbleModelTest, InvalidUrl) {
 
   std::unique_ptr<ContentSettingBubbleModel> content_setting_bubble_model(
       ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-          NULL, web_contents(), profile(), CONTENT_SETTINGS_TYPE_COOKIES));
+          NULL, web_contents(), CONTENT_SETTINGS_TYPE_COOKIES));
   const ContentSettingBubbleModel::BubbleContent& bubble_content =
       content_setting_bubble_model->bubble_content();
 

chrome/browser/ui/content_settings/content_setting_image_model.cc

@@ -126,8 +126,7 @@ class ContentSettingMediaImageModel : public ContentSettingImageModel {
 
   std::unique_ptr<ContentSettingBubbleModel> CreateBubbleModelImpl(
       ContentSettingBubbleModel::Delegate* delegate,
-      WebContents* web_contents,
-      Profile* profile) override;
+      WebContents* web_contents) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ContentSettingMediaImageModel);
@@ -215,13 +214,9 @@ ContentSettingSimpleImageModel::ContentSettingSimpleImageModel(
 std::unique_ptr<ContentSettingBubbleModel>
 ContentSettingSimpleImageModel::CreateBubbleModelImpl(
     ContentSettingBubbleModel::Delegate* delegate,
-    WebContents* web_contents,
-    Profile* profile) {
+    WebContents* web_contents) {
   return ContentSettingBubbleModel::CreateContentSettingBubbleModel(
-      delegate,
-      web_contents,
-      profile,
-      content_type());
+      delegate, web_contents, content_type());
 }
 
 // static
@@ -548,10 +543,9 @@ bool ContentSettingMediaImageModel::UpdateAndGetVisibility(
 std::unique_ptr<ContentSettingBubbleModel>
 ContentSettingMediaImageModel::CreateBubbleModelImpl(
     ContentSettingBubbleModel::Delegate* delegate,
-    WebContents* web_contents,
-    Profile* profile) {
-  return std::make_unique<ContentSettingMediaStreamBubbleModel>(
-      delegate, web_contents, profile);
+    WebContents* web_contents) {
+  return std::make_unique<ContentSettingMediaStreamBubbleModel>(delegate,
+                                                                web_contents);
 }
 
 // Blocked Framebust -----------------------------------------------------------
@@ -573,10 +567,9 @@ bool ContentSettingFramebustBlockImageModel::UpdateAndGetVisibility(
 std::unique_ptr<ContentSettingBubbleModel>
 ContentSettingFramebustBlockImageModel::CreateBubbleModelImpl(
     ContentSettingBubbleModel::Delegate* delegate,
-    WebContents* web_contents,
-    Profile* profile) {
+    WebContents* web_contents) {
   return std::make_unique<ContentSettingFramebustBlockBubbleModel>(
-      delegate, web_contents, profile);
+      delegate, web_contents);
 }
 
 // Sensors ---------------------------------------------------------------------
@@ -639,12 +632,12 @@ ContentSettingImageModel::ContentSettingImageModel(ImageType image_type)
 std::unique_ptr<ContentSettingBubbleModel>
 ContentSettingImageModel::CreateBubbleModel(
     ContentSettingBubbleModel::Delegate* delegate,
-    content::WebContents* web_contents,
-    Profile* profile) {
+    content::WebContents* web_contents) {
+  DCHECK(web_contents);
   UMA_HISTOGRAM_ENUMERATION(
       "ContentSettings.ImagePressed", image_type(),
       ContentSettingImageModel::ImageType::NUM_IMAGE_TYPES);
-  return CreateBubbleModelImpl(delegate, web_contents, profile);
+  return CreateBubbleModelImpl(delegate, web_contents);
 }
 
 // static

chrome/browser/ui/content_settings/content_setting_image_model.h

@@ -72,8 +72,7 @@ class ContentSettingImageModel {
   // Creates the model for the bubble that will be attached to this image.
   std::unique_ptr<ContentSettingBubbleModel> CreateBubbleModel(
       ContentSettingBubbleModel::Delegate* delegate,
-      content::WebContents* web_contents,
-      Profile* profile);
+      content::WebContents* web_contents);
 
   // Whether the animation should be run for the given |web_contents|.
   bool ShouldRunAnimation(content::WebContents* web_contents);
@@ -106,8 +105,7 @@ class ContentSettingImageModel {
   // Internal implementation by subclasses of bubble model creation.
   virtual std::unique_ptr<ContentSettingBubbleModel> CreateBubbleModelImpl(
       ContentSettingBubbleModel::Delegate* delegate,
-      content::WebContents* web_contents,
-      Profile* profile) = 0;
+      content::WebContents* web_contents) = 0;
 
   void set_icon(const gfx::VectorIcon& icon, const gfx::VectorIcon& badge) {
     icon_ = &icon;
@@ -140,8 +138,7 @@ class ContentSettingSimpleImageModel : public ContentSettingImageModel {
   // ContentSettingImageModel implementation.
   std::unique_ptr<ContentSettingBubbleModel> CreateBubbleModelImpl(
       ContentSettingBubbleModel::Delegate* delegate,
-      content::WebContents* web_contents,
-      Profile* profile) override;
+      content::WebContents* web_contents) override;
 
   ContentSettingsType content_type() { return content_type_; }
 
@@ -159,8 +156,7 @@ class ContentSettingFramebustBlockImageModel : public ContentSettingImageModel {
 
   std::unique_ptr<ContentSettingBubbleModel> CreateBubbleModelImpl(
       ContentSettingBubbleModel::Delegate* delegate,
-      content::WebContents* web_contents,
-      Profile* profile) override;
+      content::WebContents* web_contents) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ContentSettingFramebustBlockImageModel);

chrome/browser/ui/content_settings/content_setting_image_model_browsertest.cc

@@ -54,11 +54,10 @@ IN_PROC_BROWSER_TEST_F(ContentSettingImageModelBrowserTest, CreateBubbleModel) {
           ImageType::MIDI_SYSEX,
       };
 
-  Profile* profile = browser()->profile();
   for (auto type : content_settings_to_test) {
     auto model = ContentSettingImageModel::CreateForContentType(type);
     std::unique_ptr<ContentSettingBubbleModel> bubble(
-        model->CreateBubbleModel(nullptr, web_contents, profile));
+        model->CreateBubbleModel(nullptr, web_contents));
 
     // All of the above content settings should create a
     // ContentSettingSimpleBubbleModel that is tied to a particular setting,
@@ -78,7 +77,7 @@ IN_PROC_BROWSER_TEST_F(ContentSettingImageModelBrowserTest, CreateBubbleModel) {
   std::vector<std::unique_ptr<ContentSettingImageModel>> models =
       ContentSettingImageModel::GenerateContentSettingImageModels();
   for (auto& model : models) {
-    EXPECT_TRUE(model->CreateBubbleModel(nullptr, web_contents, profile));
+    EXPECT_TRUE(model->CreateBubbleModel(nullptr, web_contents));
     EXPECT_TRUE(image_types.insert(model->image_type()).second);
   }
 }
@@ -116,10 +115,8 @@ IN_PROC_BROWSER_TEST_F(ContentSettingImageModelBrowserTest,
       browser()->tab_strip_model()->GetActiveWebContents();
 
   auto model = ContentSettingImageModel::CreateForContentType(ImageType::ADS);
-  Profile* profile = browser()->profile();
   std::unique_ptr<ContentSettingBubbleModel> bubble(model->CreateBubbleModel(
-      browser()->content_setting_bubble_model_delegate(), web_contents,
-      profile));
+      browser()->content_setting_bubble_model_delegate(), web_contents));
 
   content::TestNavigationObserver observer(nullptr);
   observer.StartWatchingNewWebContents();

chrome/browser/ui/content_settings/framebust_block_browsertest.cc

@@ -128,8 +128,7 @@ IN_PROC_BROWSER_TEST_F(FramebustBlockBrowserTest, ModelAllowsRedirection) {
 
   // Simulate clicking on the second blocked URL.
   ContentSettingFramebustBlockBubbleModel framebust_block_bubble_model(
-      browser()->content_setting_bubble_model_delegate(), GetWebContents(),
-      browser()->profile());
+      browser()->content_setting_bubble_model_delegate(), GetWebContents());
 
   EXPECT_FALSE(clicked_index_.has_value());
   EXPECT_FALSE(clicked_url_.has_value());
@@ -166,8 +165,7 @@ IN_PROC_BROWSER_TEST_F(FramebustBlockBrowserTest, AllowRadioButtonSelected) {
   // Create a content bubble and simulate clicking on the first radio button
   // before closing it.
   ContentSettingFramebustBlockBubbleModel framebust_block_bubble_model(
-      browser()->content_setting_bubble_model_delegate(), GetWebContents(),
-      browser()->profile());
+      browser()->content_setting_bubble_model_delegate(), GetWebContents());
   std::unique_ptr<FakeOwner> owner = FakeOwner::Create(
       framebust_block_bubble_model, kDisallowRadioButtonIndex);
 
@@ -197,8 +195,7 @@ IN_PROC_BROWSER_TEST_F(FramebustBlockBrowserTest, DisallowRadioButtonSelected) {
   // Create a content bubble and simulate clicking on the second radio button
   // before closing it.
   ContentSettingFramebustBlockBubbleModel framebust_block_bubble_model(
-      browser()->content_setting_bubble_model_delegate(), GetWebContents(),
-      browser()->profile());
+      browser()->content_setting_bubble_model_delegate(), GetWebContents());
 
   std::unique_ptr<FakeOwner> owner =
       FakeOwner::Create(framebust_block_bubble_model, kAllowRadioButtonIndex);
@@ -223,8 +220,7 @@ IN_PROC_BROWSER_TEST_F(FramebustBlockBrowserTest, ManageButtonClicked) {
   // Create a content bubble and simulate clicking on the second radio button
   // before closing it.
   ContentSettingFramebustBlockBubbleModel framebust_block_bubble_model(
-      browser()->content_setting_bubble_model_delegate(), GetWebContents(),
-      browser()->profile());
+      browser()->content_setting_bubble_model_delegate(), GetWebContents());
 
   content::TestNavigationObserver navigation_observer(nullptr);
   navigation_observer.StartWatchingNewWebContents();

chrome/browser/ui/views/content_setting_bubble_contents.cc

@@ -383,6 +383,7 @@ ContentSettingBubbleContents::~ContentSettingBubbleContents() {
 }
 
 void ContentSettingBubbleContents::WindowClosing() {
+  if (content_setting_bubble_model_)
     content_setting_bubble_model_->CommitChanges();
 }
 
@@ -424,6 +425,8 @@ void ContentSettingBubbleContents::OnNativeThemeChanged(
 }
 
 base::string16 ContentSettingBubbleContents::GetWindowTitle() const {
+  if (!content_setting_bubble_model_)
+    return base::string16();
   return content_setting_bubble_model_->bubble_content().title;
 }
 
@@ -432,6 +435,7 @@ bool ContentSettingBubbleContents::ShouldShowCloseButton() const {
 }
 
 void ContentSettingBubbleContents::Init() {
+  DCHECK(content_setting_bubble_model_);
   const ChromeLayoutProvider* provider = ChromeLayoutProvider::Get();
   SetLayoutManager(std::make_unique<views::BoxLayout>(
       views::BoxLayout::kVertical, gfx::Insets(),
@@ -537,6 +541,7 @@ void ContentSettingBubbleContents::Init() {
 }
 
 views::View* ContentSettingBubbleContents::CreateExtraView() {
+  DCHECK(content_setting_bubble_model_);
   const auto& bubble_content = content_setting_bubble_model_->bubble_content();
   const auto* layout = ChromeLayoutProvider::Get();
   std::vector<View*> extra_views;
@@ -589,6 +594,9 @@ int ContentSettingBubbleContents::GetDialogButtons() const {
 
 base::string16 ContentSettingBubbleContents::GetDialogButtonLabel(
     ui::DialogButton button) const {
+  if (!content_setting_bubble_model_)
+    return base::string16();
+
   const base::string16& done_text =
       content_setting_bubble_model_->bubble_content().done_button_text;
   return done_text.empty() ? l10n_util::GetStringUTF16(IDS_DONE) : done_text;
@@ -620,11 +628,20 @@ void ContentSettingBubbleContents::OnVisibilityChanged(
 }
 
 void ContentSettingBubbleContents::WebContentsDestroyed() {
+  // Destroy the bubble model to ensure that the underlying WebContents outlives
+  // it.
+  content_setting_bubble_model_->CommitChanges();
+  content_setting_bubble_model_.reset();
+
+  // Closing the widget should synchronously hide it (and post a task to delete
+  // it). Subsequent event listener methods should not be invoked on hidden
+  // widgets.
   GetWidget()->Close();
 }
 
 void ContentSettingBubbleContents::ButtonPressed(views::Button* sender,
                                                  const ui::Event& event) {
+  DCHECK(content_setting_bubble_model_);
   if (sender == manage_checkbox_) {
     content_setting_bubble_model_->OnManageCheckboxChecked(
         manage_checkbox_->checked());
@@ -645,6 +662,7 @@ void ContentSettingBubbleContents::ButtonPressed(views::Button* sender,
 
 void ContentSettingBubbleContents::LinkClicked(views::Link* source,
                                                int event_flags) {
+  DCHECK(content_setting_bubble_model_);
   if (source == custom_link_) {
     content_setting_bubble_model_->OnCustomLinkClicked();
     GetWidget()->Close();
@@ -656,6 +674,7 @@ void ContentSettingBubbleContents::LinkClicked(views::Link* source,
 }
 
 void ContentSettingBubbleContents::OnPerformAction(views::Combobox* combobox) {
+  DCHECK(content_setting_bubble_model_);
   MediaComboboxModel* model =
       static_cast<MediaComboboxModel*>(combobox->model());
   content_setting_bubble_model_->OnMediaMenuClicked(

chrome/browser/ui/views/location_bar/content_setting_image_view.cc

@@ -7,7 +7,6 @@
 #include <utility>
 
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
@@ -129,8 +128,7 @@ bool ContentSettingImageView::ShowBubble(const ui::Event& event) {
     views::View* const anchor = parent();
     bubble_view_ = new ContentSettingBubbleContents(
         content_setting_image_model_->CreateBubbleModel(
-            delegate_->GetContentSettingBubbleModelDelegate(), web_contents,
-            Profile::FromBrowserContext(web_contents->GetBrowserContext())),
+            delegate_->GetContentSettingBubbleModelDelegate(), web_contents),
         web_contents, anchor, views::BubbleBorder::TOP_RIGHT);
     bubble_view_->SetHighlightedButton(this);
     views::Widget* bubble_widget =