Revert 98938 - Migrate Obsolete NotificationsSettings and remove content_settings::NotificationsP...

chrome/browser/content_settings/host_content_settings_map.cc

 // Copyright (c) 2011 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/content_settings/host_content_settings_map.h"
 
 #include <list>
 
 #include "base/command_line.h"
 #include "base/string_util.h"
@@ skipping 20 matching lines @@
 #include "googleurl/src/gurl.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/static_cookie_policy.h"
 
 namespace {
 
 // Returns true if we should allow all content types for this URL.  This is
 // true for various internal objects like chrome:// URLs, so UI and other
 // things users think of as "not webpages" don't break.
-static bool ShouldAllowAllContent(const GURL& url,
-                                  ContentSettingsType content_type) {
-  if (content_type == CONTENT_SETTINGS_TYPE_NOTIFICATIONS)
-    return false;
+static bool ShouldAllowAllContent(const GURL& url) {
   return url.SchemeIs(chrome::kChromeDevToolsScheme) ||
          url.SchemeIs(chrome::kChromeInternalScheme) ||
          url.SchemeIs(chrome::kChromeUIScheme) ||
          url.SchemeIs(chrome::kExtensionScheme);
 }
 
 typedef linked_ptr<content_settings::DefaultProviderInterface>
     DefaultContentSettingsProviderPtr;
 typedef std::vector<DefaultContentSettingsProviderPtr>::iterator
     DefaultProviderIterator;
@@ skipping 125 matching lines @@
   ContentSettings output(CONTENT_SETTING_DEFAULT);
   for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i)
     output.settings[i] = GetDefaultContentSetting(ContentSettingsType(i));
   return output;
 }
 
 ContentSetting HostContentSettingsMap::GetCookieContentSetting(
     const GURL& url,
     const GURL& first_party_url,
     bool setting_cookie) const {
-  if (ShouldAllowAllContent(first_party_url, CONTENT_SETTINGS_TYPE_COOKIES))
+  if (ShouldAllowAllContent(first_party_url))
     return CONTENT_SETTING_ALLOW;
 
   // First get any host-specific settings.
   ContentSetting setting = GetNonDefaultContentSetting(url,
       first_party_url, CONTENT_SETTINGS_TYPE_COOKIES, "");
 
   // If no explicit exception has been made and third-party cookies are blocked
   // by default, apply that rule.
   if (setting == CONTENT_SETTING_DEFAULT && BlockThirdPartyCookies()) {
     bool strict = CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 40 matching lines @@
   if (setting == CONTENT_SETTING_DEFAULT)
     return GetDefaultContentSetting(content_type);
   return setting;
 }
 
 ContentSetting HostContentSettingsMap::GetNonDefaultContentSetting(
       const GURL& primary_url,
       const GURL& secondary_url,
       ContentSettingsType content_type,
       const std::string& resource_identifier) const {
-  if (ShouldAllowAllContent(secondary_url, content_type))
+  if (ShouldAllowAllContent(secondary_url))
     return CONTENT_SETTING_ALLOW;
 
   // Iterate through the list of providers and break when the first non default
   // setting is found.
   ContentSetting provided_setting(CONTENT_SETTING_DEFAULT);
   for (ConstProviderIterator provider = content_settings_providers_.begin();
        provider != content_settings_providers_.end();
        ++provider) {
     provided_setting = (*provider)->GetContentSetting(
         primary_url, secondary_url, content_type, resource_identifier);
@@ skipping 18 matching lines @@
         j != CONTENT_SETTINGS_TYPE_PLUGINS) {
       output.settings[j] = GetDefaultContentSetting(ContentSettingsType(j));
     }
   }
   return output;
 }
 
 ContentSettings HostContentSettingsMap::GetNonDefaultContentSettings(
     const GURL& primary_url,
     const GURL& secondary_url) const {
+  if (ShouldAllowAllContent(secondary_url))
+    return ContentSettings(CONTENT_SETTING_ALLOW);
+
   ContentSettings output(CONTENT_SETTING_DEFAULT);
   for (int j = 0; j < CONTENT_SETTINGS_NUM_TYPES; ++j) {
     output.settings[j] = GetNonDefaultContentSetting(
         primary_url,
         secondary_url,
         ContentSettingsType(j),
         "");
   }
   return output;
 }
@@ skipping 243 matching lines @@
         SetDefaultContentSetting(CONTENT_SETTINGS_TYPE_COOKIES,
             (cookie_behavior == net::StaticCookiePolicy::BLOCK_ALL_COOKIES) ?
                 CONTENT_SETTING_BLOCK : CONTENT_SETTING_ALLOW);
     }
     if (!prefs_->HasPrefPath(prefs::kBlockThirdPartyCookies)) {
       SetBlockThirdPartyCookies(cookie_behavior ==
           net::StaticCookiePolicy::BLOCK_SETTING_THIRD_PARTY_COOKIES);
     }
   }
 }