Remove kEnableResourceContentSettings and all the code that uses it since it's been behind a flag f…

chrome/browser/ui/blocked_content/popup_blocker_tab_helper.cc

 // Copyright 2013 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/blocked_content/popup_blocker_tab_helper.h"
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 78 matching lines @@
 
   if (creator.is_valid() &&
       profile->GetHostContentSettingsMap()->GetContentSetting(
           creator, creator, CONTENT_SETTINGS_TYPE_POPUPS, std::string()) ==
           CONTENT_SETTING_ALLOW) {
     return false;
   } else {
     if (blocked_popups_.size() < kMaximumNumberOfPopups) {
       blocked_popups_.Add(new BlockedRequest(params, window_features));
       TabSpecificContentSettings::FromWebContents(web_contents())->
-          OnContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS, std::string());
+          OnContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS);
     }
     return true;
   }
 }
 
 void PopupBlockerTabHelper::AddBlockedPopup(const BlockedWindowParams& params) {
   chrome::NavigateParams nav_params =
       params.CreateNavigateParams(web_contents());
 
   if (blocked_popups_.size() < kMaximumNumberOfPopups) {
     blocked_popups_.Add(new BlockedRequest(nav_params, params.features()));
     TabSpecificContentSettings::FromWebContents(web_contents())->
-        OnContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS, std::string());
+        OnContentBlocked(CONTENT_SETTINGS_TYPE_POPUPS);
   }
 }
 
 void PopupBlockerTabHelper::ShowBlockedPopup(int32 id) {
   BlockedRequest* popup = blocked_popups_.Lookup(id);
   if (!popup)
     return;
 #if defined(OS_ANDROID)
   TabModelList::HandlePopupNavigation(&popup->params);
 #else
@@ skipping 16 matching lines @@
     PopupBlockerTabHelper::GetBlockedPopupRequests() {
   PopupIdMap result;
   for (IDMap<BlockedRequest, IDMapOwnPointer>::const_iterator iter(
            &blocked_popups_);
        !iter.IsAtEnd();
        iter.Advance()) {
     result[iter.GetCurrentKey()] = iter.GetCurrentValue()->params.url;
   }
   return result;
 }