Stop inheriting push notification permissions from regular to incognito

chrome/browser/content_settings/content_settings_pref_provider_unittest.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/content_settings_pref_provider.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 162 matching lines @@
   pref_content_settings_provider.SetWebsiteSetting(
       pattern,
       pattern,
       CONTENT_SETTINGS_TYPE_IMAGES,
       std::string(),
       new base::FundamentalValue(CONTENT_SETTING_ALLOW));
 
   GURL host("http://example.com/");
   // The value should of course be visible in the regular PrefProvider.
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
-            GetContentSetting(&pref_content_settings_provider,
-                              host,
-                              host,
-                              CONTENT_SETTINGS_TYPE_IMAGES,
-                              std::string(),
-                              false));
+            TestUtils::GetContentSetting(&pref_content_settings_provider, host,
+                                         host, CONTENT_SETTINGS_TYPE_IMAGES,
+                                         std::string(), false));
   // And also in the OTR version.
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
-            GetContentSetting(&pref_content_settings_provider_incognito,
-                              host,
-                              host,
-                              CONTENT_SETTINGS_TYPE_IMAGES,
-                              std::string(),
-                              false));
+            TestUtils::GetContentSetting(
+                &pref_content_settings_provider_incognito, host, host,
+                CONTENT_SETTINGS_TYPE_IMAGES, std::string(), false));
   const WebsiteSettingsInfo* info =
       WebsiteSettingsRegistry::GetInstance()->Get(CONTENT_SETTINGS_TYPE_IMAGES);
   // But the value should not be overridden in the OTR user prefs accidentally.
   EXPECT_FALSE(otr_user_prefs->IsSetInOverlay(info->pref_name()));
 
   pref_content_settings_provider.ShutdownOnUIThread();
   pref_content_settings_provider_incognito.ShutdownOnUIThread();
 }
 
 TEST_F(PrefProviderTest, GetContentSettingsValue) {
   TestingProfile testing_profile;
   PrefProvider provider(testing_profile.GetPrefs(), false);
 
   GURL primary_url("http://example.com/");
   ContentSettingsPattern primary_pattern =
       ContentSettingsPattern::FromString("[*.]example.com");
 
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
-            GetContentSetting(&provider,
-                              primary_url,
-                              primary_url,
-                              CONTENT_SETTINGS_TYPE_IMAGES,
-                              std::string(),
-                              false));
+            TestUtils::GetContentSetting(&provider, primary_url, primary_url,
+                                         CONTENT_SETTINGS_TYPE_IMAGES,
+                                         std::string(), false));
 
-  EXPECT_EQ(NULL,
-            GetContentSettingValue(&provider,
-                                   primary_url,
-                                   primary_url,
-                                   CONTENT_SETTINGS_TYPE_IMAGES,
-                                   std::string(),
-                                   false));
+  EXPECT_EQ(NULL, TestUtils::GetContentSettingValue(
+                      &provider, primary_url, primary_url,
+                      CONTENT_SETTINGS_TYPE_IMAGES, std::string(), false));
 
   provider.SetWebsiteSetting(primary_pattern,
                              primary_pattern,
                              CONTENT_SETTINGS_TYPE_IMAGES,
                              std::string(),
                              new base::FundamentalValue(CONTENT_SETTING_BLOCK));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
-            GetContentSetting(&provider,
-                              primary_url,
-                              primary_url,
-                              CONTENT_SETTINGS_TYPE_IMAGES,
-                              std::string(),
-                              false));
-  scoped_ptr<base::Value> value_ptr(
-      GetContentSettingValue(&provider,
-                             primary_url,
-                             primary_url,
-                             CONTENT_SETTINGS_TYPE_IMAGES,
-                             std::string(),
-                             false));
+            TestUtils::GetContentSetting(&provider, primary_url, primary_url,
+                                         CONTENT_SETTINGS_TYPE_IMAGES,
+                                         std::string(), false));
+  scoped_ptr<base::Value> value_ptr(TestUtils::GetContentSettingValue(
+      &provider, primary_url, primary_url, CONTENT_SETTINGS_TYPE_IMAGES,
+      std::string(), false));
   int int_value = -1;
   value_ptr->GetAsInteger(&int_value);
   EXPECT_EQ(CONTENT_SETTING_BLOCK, IntToContentSetting(int_value));
 
   provider.SetWebsiteSetting(primary_pattern,
                              primary_pattern,
                              CONTENT_SETTINGS_TYPE_IMAGES,
                              std::string(),
                              NULL);
-  EXPECT_EQ(NULL,
-            GetContentSettingValue(&provider,
-                                   primary_url,
-                                   primary_url,
-                                   CONTENT_SETTINGS_TYPE_IMAGES,
-                                   std::string(),
-                                   false));
+  EXPECT_EQ(NULL, TestUtils::GetContentSettingValue(
+                      &provider, primary_url, primary_url,
+                      CONTENT_SETTINGS_TYPE_IMAGES, std::string(), false));
   provider.ShutdownOnUIThread();
 }
 
 TEST_F(PrefProviderTest, Patterns) {
   TestingProfile testing_profile;
   PrefProvider pref_content_settings_provider(testing_profile.GetPrefs(),
                                               false);
 
   GURL host1("http://example.com/");
   GURL host2("http://www.example.com/");
   GURL host3("http://example.org/");
   GURL host4("file:///tmp/test.html");
   ContentSettingsPattern pattern1 =
       ContentSettingsPattern::FromString("[*.]example.com");
   ContentSettingsPattern pattern2 =
       ContentSettingsPattern::FromString("example.org");
   ContentSettingsPattern pattern3 =
       ContentSettingsPattern::FromString("file:///tmp/test.html");
 
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
-            GetContentSetting(&pref_content_settings_provider,
-                              host1,
-                              host1,
-                              CONTENT_SETTINGS_TYPE_IMAGES,
-                              std::string(),
-                              false));
+            TestUtils::GetContentSetting(&pref_content_settings_provider, host1,
+                                         host1, CONTENT_SETTINGS_TYPE_IMAGES,
+                                         std::string(), false));
   pref_content_settings_provider.SetWebsiteSetting(
       pattern1,
       pattern1,
       CONTENT_SETTINGS_TYPE_IMAGES,
       std::string(),
       new base::FundamentalValue(CONTENT_SETTING_BLOCK));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
-            GetContentSetting(&pref_content_settings_provider,
-                              host1,
-                              host1,
-                              CONTENT_SETTINGS_TYPE_IMAGES,
-                              std::string(),
-                              false));
+            TestUtils::GetContentSetting(&pref_content_settings_provider, host1,
+                                         host1, CONTENT_SETTINGS_TYPE_IMAGES,
+                                         std::string(), false));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
-            GetContentSetting(&pref_content_settings_provider,
-                              host2,
-                              host2,
-                              CONTENT_SETTINGS_TYPE_IMAGES,
-                              std::string(),
-                              false));
+            TestUtils::GetContentSetting(&pref_content_settings_provider, host2,
+                                         host2, CONTENT_SETTINGS_TYPE_IMAGES,
+                                         std::string(), false));
 
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
-            GetContentSetting(&pref_content_settings_provider,
-                              host3,
-                              host3,
-                              CONTENT_SETTINGS_TYPE_IMAGES,
-                              std::string(),
-                              false));
+            TestUtils::GetContentSetting(&pref_content_settings_provider, host3,
+                                         host3, CONTENT_SETTINGS_TYPE_IMAGES,
+                                         std::string(), false));
   pref_content_settings_provider.SetWebsiteSetting(
       pattern2,
       pattern2,
       CONTENT_SETTINGS_TYPE_IMAGES,
       std::string(),
       new base::FundamentalValue(CONTENT_SETTING_BLOCK));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
-            GetContentSetting(&pref_content_settings_provider,
-                              host3,
-                              host3,
-                              CONTENT_SETTINGS_TYPE_IMAGES,
-                              std::string(),
-                              false));
+            TestUtils::GetContentSetting(&pref_content_settings_provider, host3,
+                                         host3, CONTENT_SETTINGS_TYPE_IMAGES,
+                                         std::string(), false));
 
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
-            GetContentSetting(&pref_content_settings_provider,
-                              host4,
-                              host4,
-                              CONTENT_SETTINGS_TYPE_IMAGES,
-                              std::string(),
-                              false));
+            TestUtils::GetContentSetting(&pref_content_settings_provider, host4,
+                                         host4, CONTENT_SETTINGS_TYPE_IMAGES,
+                                         std::string(), false));
   pref_content_settings_provider.SetWebsiteSetting(
       pattern3,
       pattern3,
       CONTENT_SETTINGS_TYPE_IMAGES,
       std::string(),
       new base::FundamentalValue(CONTENT_SETTING_BLOCK));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
-            GetContentSetting(&pref_content_settings_provider,
-                              host4,
-                              host4,
-                              CONTENT_SETTINGS_TYPE_IMAGES,
-                              std::string(),
-                              false));
+            TestUtils::GetContentSetting(&pref_content_settings_provider, host4,
+                                         host4, CONTENT_SETTINGS_TYPE_IMAGES,
+                                         std::string(), false));
 
   pref_content_settings_provider.ShutdownOnUIThread();
 }
 
 TEST_F(PrefProviderTest, ResourceIdentifier) {
   TestingProfile testing_profile;
   PrefProvider pref_content_settings_provider(testing_profile.GetPrefs(),
                                               false);
 
   GURL host("http://example.com/");
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromString("[*.]example.com");
   std::string resource1("someplugin");
   std::string resource2("otherplugin");
 
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
-            GetContentSetting(
-                &pref_content_settings_provider,
-                host, host, CONTENT_SETTINGS_TYPE_PLUGINS,
-                resource1, false));
+            TestUtils::GetContentSetting(&pref_content_settings_provider, host,
+                                         host, CONTENT_SETTINGS_TYPE_PLUGINS,
+                                         resource1, false));
   pref_content_settings_provider.SetWebsiteSetting(
       pattern,
       pattern,
       CONTENT_SETTINGS_TYPE_PLUGINS,
       resource1,
       new base::FundamentalValue(CONTENT_SETTING_BLOCK));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
-            GetContentSetting(
-                &pref_content_settings_provider,
-                host, host, CONTENT_SETTINGS_TYPE_PLUGINS,
-                resource1, false));
+            TestUtils::GetContentSetting(&pref_content_settings_provider, host,
+                                         host, CONTENT_SETTINGS_TYPE_PLUGINS,
+                                         resource1, false));
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
-            GetContentSetting(
-                &pref_content_settings_provider,
-                host, host, CONTENT_SETTINGS_TYPE_PLUGINS,
-                resource2, false));
+            TestUtils::GetContentSetting(&pref_content_settings_provider, host,
+                                         host, CONTENT_SETTINGS_TYPE_PLUGINS,
+                                         resource2, false));
 
   pref_content_settings_provider.ShutdownOnUIThread();
 }
 
 // http://crosbug.com/17760
 TEST_F(PrefProviderTest, Deadlock) {
   syncable_prefs::TestingPrefServiceSyncable prefs;
   PrefProvider::RegisterProfilePrefs(prefs.registry());
 
   // Chain of events: a preference changes, |PrefProvider| notices it, and reads
@@ skipping 185 matching lines @@
   for (const char* pref : nonempty_prefs) {
     DictionaryPrefUpdate update(&prefs, pref);
     const base::DictionaryValue* dictionary = update.Get();
     EXPECT_EQ(1u, dictionary->size());
   }
 
   provider.ShutdownOnUIThread();
 }
 
 }  // namespace content_settings