Stop inheriting push notification permissions from regular to incognito

chrome/browser/content_settings/content_settings_default_provider_unittest.cc

Index: chrome/browser/content_settings/content_settings_default_provider_unittest.cc
diff --git a/chrome/browser/content_settings/content_settings_default_provider_unittest.cc b/chrome/browser/content_settings/content_settings_default_provider_unittest.cc
index add61aa6c3c0e53899c1d6a12fddb7057490f0fd..7a0f5d8e4b313c74e9c109316bc62ef51ba61048 100644
--- a/chrome/browser/content_settings/content_settings_default_provider_unittest.cc
+++ b/chrome/browser/content_settings/content_settings_default_provider_unittest.cc
@@ -182,7 +182,8 @@ TEST_F(DefaultProviderTest, ObservePref) {
 }
 
 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_,
@@ -190,14 +191,14 @@ TEST_F(DefaultProviderTest, OffTheRecord) {
                               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.
@@ -213,7 +214,7 @@ TEST_F(DefaultProviderTest, OffTheRecord) {
                               GURL(),
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
-                              false));
+                              false /* include_incognito */));
 
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&otr_provider,
@@ -221,7 +222,7 @@ TEST_F(DefaultProviderTest, OffTheRecord) {
                               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(
@@ -239,7 +240,7 @@ TEST_F(DefaultProviderTest, OffTheRecord) {
                               GURL(),
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
-                              false));
+                              false /* include_incognito */));
 
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&otr_provider,
@@ -247,6 +248,19 @@ TEST_F(DefaultProviderTest, OffTheRecord) {
                               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();
 }