Stop inheriting push notification permissions from regular to incognito

components/content_settings/core/browser/host_content_settings_map.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 "components/content_settings/core/browser/host_content_settings_map.h"
 
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 139 matching lines @@
 
   // Iterate through the list of providers and return the first non-NULL value
   // that matches |primary_url| and |secondary_url|.
   for (ConstProviderIterator provider = content_settings_providers_.begin();
        provider != content_settings_providers_.end();
        ++provider) {
     if (provider->first == PREF_PROVIDER)
       continue;
     ContentSetting default_setting =
         GetDefaultContentSettingFromProvider(content_type, provider->second);
+    if (is_off_the_record_) {
+      default_setting = CoerceSettingInheritedToIncognito(content_type,
+                                                          default_setting);
+    }
     if (default_setting != CONTENT_SETTING_DEFAULT) {
       if (provider_id)
         *provider_id = kProviderNamesSourceMap[provider->first].provider_name;
       return default_setting;
     }
   }
 
   return CONTENT_SETTING_DEFAULT;
 }
 
@@ skipping 477 matching lines @@
     primary_pattern = &info->primary_pattern;
     secondary_pattern = &info->secondary_pattern;
   }
 
   // The list of |content_settings_providers_| is ordered according to their
   // precedence.
   for (ConstProviderIterator provider = content_settings_providers_.begin();
        provider != content_settings_providers_.end();
        ++provider) {
 
-    scoped_ptr<base::Value> value(
+    scoped_ptr<base::Value> value =
         content_settings::GetContentSettingValueAndPatterns(provider->second,
                                                             primary_url,
                                                             secondary_url,
                                                             content_type,
                                                             resource_identifier,
                                                             is_off_the_record_,
                                                             primary_pattern,
-                                                            secondary_pattern));
+                                                            secondary_pattern);
     if (value) {
       if (info)
         info->source = kProviderNamesSourceMap[provider->first].provider_source;
       return value.Pass();
     }
   }
 
   if (info) {
     info->source = content_settings::SETTING_SOURCE_NONE;
     info->primary_pattern = ContentSettingsPattern();
     info->secondary_pattern = ContentSettingsPattern();
   }
   return scoped_ptr<base::Value>();
 }
+
+// static
+ContentSetting HostContentSettingsMap::CoerceSettingInheritedToIncognito(
+    ContentSettingsType content_type,
+    ContentSetting setting) {
+  if (setting != CONTENT_SETTING_ALLOW)
+    return setting;
+  const content_settings::ContentSettingsInfo* info =
+      content_settings::ContentSettingsRegistry::GetInstance()
+          ->Get(content_type);
+  if (info->incognito_behavior() !=
+      content_settings::ContentSettingsInfo::INHERIT_IN_INCOGNITO_EXCEPT_ALLOW)
+    return setting;
+  DCHECK(info->IsSettingValid(CONTENT_SETTING_ASK));
+  return CONTENT_SETTING_ASK;
+}