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"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/clock.h"
 #include "components/content_settings/core/browser/content_settings_default_provider.h"
 #include "components/content_settings/core/browser/content_settings_details.h"
 #include "components/content_settings/core/browser/content_settings_info.h"
 #include "components/content_settings/core/browser/content_settings_observable_provider.h"
 #include "components/content_settings/core/browser/content_settings_policy_provider.h"
 #include "components/content_settings/core/browser/content_settings_pref_provider.h"
 #include "components/content_settings/core/browser/content_settings_provider.h"
 #include "components/content_settings/core/browser/content_settings_registry.h"
 #include "components/content_settings/core/browser/content_settings_rule.h"
 #include "components/content_settings/core/browser/content_settings_utils.h"
+#include "components/content_settings/core/browser/website_settings_info.h"
+#include "components/content_settings/core/browser/website_settings_registry.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/content_settings/core/common/pref_names.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "net/base/net_errors.h"
 #include "net/base/static_cookie_policy.h"
 #include "url/gurl.h"
 
 namespace {
 
 typedef std::vector<content_settings::Rule> Rules;
@@ skipping 113 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 == CONTENT_SETTING_ALLOW) {
+      if (content_settings::WebsiteSettingsRegistry::GetInstance()

[Michael van Ouwerkerk, 2015/11/26 18:51:06]

As this is a wrapped condition, it should have curly braces.

[johnme, 2015/11/27 14:12:28]

Removed this, but done elsewhere.

+              ->Get(content_type)->incognito_behavior()
+          == content_settings::WebsiteSettingsInfo
+                             ::INHERIT_IN_INCOGNITO_EXCEPT_ALLOW)

[Michael van Ouwerkerk, 2015/11/26 18:51:06]

This whole section is a bit hard to read because of wrapping and multiple
conditionals. Any ideas for making it more readable? Maybe "using
content_settings::WebsiteSettingsRegistry" and "using
content_settings::WebsiteSettingsInfo" to reduce wrapping?

[johnme, 2015/11/27 14:12:29]

I tidied this up.

+        default_setting = CONTENT_SETTING_ASK;
+    }
     if (default_setting != CONTENT_SETTING_DEFAULT) {
       if (provider_id)
         *provider_id = kProviderNamesSourceMap[provider->first].provider_name;
       return default_setting;
     }
   }
 
   return CONTENT_SETTING_DEFAULT;
 }
 
@@ skipping 443 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>();
 }