Stop inheriting push notification permissions from regular to incognito

chrome/browser/content_settings/content_settings_default_provider_unittest.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 "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/prefs/testing_pref_service.h"
 #include "chrome/browser/content_settings/content_settings_mock_observer.h"
@@ skipping 164 matching lines @@
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&provider_,
                               GURL(),
                               GURL(),
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
                               false));
 }
 
 TEST_F(DefaultProviderTest, OffTheRecord) {
-  content_settings::DefaultProvider otr_provider(profile_.GetPrefs(), true);
+  content_settings::DefaultProvider otr_provider(profile_.GetPrefs(),
+                                                 true /* incognito */);
 
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             GetContentSetting(&provider_,
                               GURL(),
                               GURL(),
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
-                              false));
+                              false /* include_incognito */));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             GetContentSetting(&otr_provider,
                               GURL(),
                               GURL(),
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
-                              true));
+                              true /* include_incognito */));
 
   // Changing content settings on the main provider should also affect the
   // incognito map.
   provider_.SetWebsiteSetting(
       ContentSettingsPattern::Wildcard(),
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_COOKIES,
       std::string(),
       new base::FundamentalValue(CONTENT_SETTING_BLOCK));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&provider_,
                               GURL(),
                               GURL(),
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
-                              false));
+                              false /* include_incognito */));
 
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&otr_provider,
                               GURL(),
                               GURL(),
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
-                              true));
+                              true /* include_incognito */));
 
   // Changing content settings on the incognito provider should be ignored.
   scoped_ptr<base::Value> value(
       new base::FundamentalValue(CONTENT_SETTING_ALLOW));
   bool owned = otr_provider.SetWebsiteSetting(
       ContentSettingsPattern::Wildcard(),
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_COOKIES,
       std::string(),
       value.get());
   EXPECT_FALSE(owned);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&provider_,
                               GURL(),
                               GURL(),
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
-                              false));
+                              false /* include_incognito */));
 
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&otr_provider,
                               GURL(),
                               GURL(),
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
-                              true));
+                              true /* include_incognito */));
+
+  // Check that new OTR DefaultProviders also inherit the correct value.
+  content_settings::DefaultProvider otr_provider2(profile_.GetPrefs(),
+                                                  true /* incognito */);
+  EXPECT_EQ(CONTENT_SETTING_BLOCK,
+            GetContentSetting(&otr_provider2,
+                              GURL(),
+                              GURL(),
+                              CONTENT_SETTINGS_TYPE_COOKIES,
+                              std::string(),
+                              true /* include_incognito */));
+
   otr_provider.ShutdownOnUIThread();
+  otr_provider2.ShutdownOnUIThread();
 }