Replace HostContentSettingsMap::AddExceptionForURL with SetNarrowestWebsiteSetting

chrome/browser/ui/content_settings/content_setting_bubble_model.cc

 // 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.
 
 #include "chrome/browser/ui/content_settings/content_setting_bubble_model.h"
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
@@ skipping 238 matching lines @@
                                  Profile* profile,
                                  ContentSettingsType content_type);
   ~ContentSettingSingleRadioGroup() override;
 
  protected:
   bool settings_changed() const;
   int selected_item() const { return selected_item_; }
 
  private:
   void SetRadioGroup();
-  void AddException(ContentSetting setting);
+  void SetNarrowestContentSetting(ContentSetting setting);
   void OnRadioClicked(int radio_index) override;
 
   ContentSetting block_setting_;
   int selected_item_;
 };
 
 ContentSettingSingleRadioGroup::ContentSettingSingleRadioGroup(
     Delegate* delegate,
     WebContents* web_contents,
     Profile* profile,
     ContentSettingsType content_type)
     : ContentSettingTitleLinkAndCustomModel(delegate, web_contents, profile,
                                             content_type),
       block_setting_(CONTENT_SETTING_BLOCK),
       selected_item_(0) {
   SetRadioGroup();
 }
 
 ContentSettingSingleRadioGroup::~ContentSettingSingleRadioGroup() {
   if (settings_changed()) {
     ContentSetting setting =
         selected_item_ == kAllowButtonIndex ?
                           CONTENT_SETTING_ALLOW :
                           block_setting_;
-    AddException(setting);
+    SetNarrowestContentSetting(setting);
   }
 }
 
 bool ContentSettingSingleRadioGroup::settings_changed() const {
   return selected_item_ != bubble_content().radio_group.default_item;
 }
 
 // Initialize the radio group by setting the appropriate labels for the
 // content type and setting the default value based on the content setting.
 void ContentSettingSingleRadioGroup::SetRadioGroup() {
@@ skipping 112 matching lines @@
                          setting != CONTENT_SETTING_ASK);
   if (setting_source != SETTING_SOURCE_USER) {
     set_radio_group_enabled(false);
   } else {
     set_radio_group_enabled(true);
   }
   selected_item_ = radio_group.default_item;
   set_radio_group(radio_group);
 }
 
-void ContentSettingSingleRadioGroup::AddException(ContentSetting setting) {
+void ContentSettingSingleRadioGroup::SetNarrowestContentSetting(
+    ContentSetting setting) {
   if (profile()) {
-    HostContentSettingsMapFactory::GetForProfile(profile())->AddExceptionForURL(
-        bubble_content().radio_group.url,
-        bubble_content().radio_group.url,
-        content_type(),
-        setting);
+    HostContentSettingsMapFactory::GetForProfile(profile())
+        ->SetNarrowestContentSetting(bubble_content().radio_group.url,
+                                     bubble_content().radio_group.url,
+                                     content_type(), setting);
   }
 }
 
 void ContentSettingSingleRadioGroup::OnRadioClicked(int radio_index) {
   selected_item_ = radio_index;
 }
 
 class ContentSettingCookiesBubbleModel : public ContentSettingSingleRadioGroup {
  public:
   ContentSettingCookiesBubbleModel(Delegate* delegate,
@@ skipping 945 matching lines @@
   if (type == content::NOTIFICATION_WEB_CONTENTS_DESTROYED) {
     DCHECK_EQ(web_contents_,
               content::Source<WebContents>(source).ptr());
     web_contents_ = NULL;
   } else {
     DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type);
     DCHECK_EQ(profile_, content::Source<Profile>(source).ptr());
     profile_ = NULL;
   }
 }