Replace SetContentSetting method of the content_settings::Provider interface with GetWebsiteSetting

chrome/browser/content_settings/content_settings_pref_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 "chrome/browser/content_settings/content_settings_pref_provider.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/platform_thread.h"
+#include "base/values.h"
 #include "chrome/browser/content_settings/content_settings_mock_observer.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/default_pref_store.h"
 #include "chrome/browser/prefs/incognito_user_pref_store.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/pref_service_mock_builder.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/prefs/testing_pref_store.h"
@@ skipping 92 matching lines @@
   PrefProvider* provider_;
   PrefChangeRegistrar pref_change_registrar_;
   bool notification_received_;
   DISALLOW_COPY_AND_ASSIGN(DeadlockCheckerObserver);
 };
 
 class PrefProviderTest : public testing::Test {
  public:
   PrefProviderTest() : ui_thread_(
       BrowserThread::UI, &message_loop_) {
+    value_allow.reset(Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
+    value_block.reset(Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
   }
 
  protected:
   MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
+  scoped_ptr<base::Value> value_allow;

[Bernhard Bauer, 2011/11/11 14:00:40]

Class member names end with an underscore.

[markusheintz_, 2011/11/14 11:15:10]

Shame on me. Glad I removed them now.

+  scoped_ptr<base::Value> value_block;
 };
 
 TEST_F(PrefProviderTest, Observer) {
   TestingProfile profile;
   PrefProvider pref_content_settings_provider(profile.GetPrefs(), false);
 
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromString("[*.]example.com");
   content_settings::MockObserver mock_observer;
   EXPECT_CALL(mock_observer,
               OnContentSettingChanged(pattern,
                                       ContentSettingsPattern::Wildcard(),
                                       CONTENT_SETTINGS_TYPE_IMAGES,
                                       ""));
 
   pref_content_settings_provider.AddObserver(&mock_observer);
 
-  pref_content_settings_provider.SetContentSetting(
+  pref_content_settings_provider.SetWebsiteSetting(
       pattern,
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_IMAGES,
       "",
-      CONTENT_SETTING_ALLOW);
+      value_allow.get());
 
   pref_content_settings_provider.ShutdownOnUIThread();
 }
 
 // Test for regression in which the PrefProvider modified the user pref store
 // of the OTR unintentionally: http://crbug.com/74466.
 TEST_F(PrefProviderTest, Incognito) {
   PersistentPrefStore* user_prefs = new TestingPrefStore();
   IncognitoUserPrefStore* otr_user_prefs =
       new IncognitoUserPrefStore(user_prefs);
@@ skipping 13 matching lines @@
   TestingProfile* otr_profile = new TestingProfile;
   profile.SetOffTheRecordProfile(otr_profile);
   profile.SetPrefService(regular_prefs);
   otr_profile->set_incognito(true);
   otr_profile->SetPrefService(otr_prefs);
 
   PrefProvider pref_content_settings_provider(regular_prefs, false);
   PrefProvider pref_content_settings_provider_incognito(otr_prefs, true);
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromString("[*.]example.com");
-  pref_content_settings_provider.SetContentSetting(
+  pref_content_settings_provider.SetWebsiteSetting(
       pattern,
       pattern,
       CONTENT_SETTINGS_TYPE_IMAGES,
       "",
-      CONTENT_SETTING_ALLOW);
+      value_allow.get());
 
   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, "", false));
   // And also in the OTR version.
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             GetContentSetting(
@@ skipping 16 matching lines @@
 
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
             GetContentSetting(&provider, primary_url, primary_url,
                               CONTENT_SETTINGS_TYPE_IMAGES, "", false));
 
   EXPECT_EQ(NULL,
             GetContentSettingValue(
                 &provider, primary_url, primary_url,
                 CONTENT_SETTINGS_TYPE_IMAGES, "", false));
 
-  provider.SetContentSetting(primary_pattern,
+  provider.SetWebsiteSetting(primary_pattern,
                              primary_pattern,
                              CONTENT_SETTINGS_TYPE_IMAGES,
                              "",
-                             CONTENT_SETTING_BLOCK);
+                             value_block.get());
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&provider, primary_url, primary_url,
                               CONTENT_SETTINGS_TYPE_IMAGES, "", false));
   scoped_ptr<Value> value_ptr(
       GetContentSettingValue(&provider, primary_url, primary_url,
                              CONTENT_SETTINGS_TYPE_IMAGES, "", false));
   int int_value = -1;
   value_ptr->GetAsInteger(&int_value);
   EXPECT_EQ(CONTENT_SETTING_BLOCK, IntToContentSetting(int_value));
 
-  provider.SetContentSetting(primary_pattern,
+  provider.SetWebsiteSetting(primary_pattern,
                              primary_pattern,
                              CONTENT_SETTINGS_TYPE_IMAGES,
                              "",
-                             CONTENT_SETTING_DEFAULT);
+                             NULL);
   EXPECT_EQ(NULL,
             GetContentSettingValue(
                 &provider, primary_url, primary_url,
                 CONTENT_SETTINGS_TYPE_IMAGES, "", 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, "", false));
-  pref_content_settings_provider.SetContentSetting(
+  pref_content_settings_provider.SetWebsiteSetting(
       pattern1,
       pattern1,
       CONTENT_SETTINGS_TYPE_IMAGES,
       "",
-      CONTENT_SETTING_BLOCK);
+      value_block.get());
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(
                 &pref_content_settings_provider,
                 host1, host1, CONTENT_SETTINGS_TYPE_IMAGES, "", false));
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(
                 &pref_content_settings_provider,
                 host2, host2, CONTENT_SETTINGS_TYPE_IMAGES, "", false));
 
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
             GetContentSetting(
                 &pref_content_settings_provider,
                 host3, host3, CONTENT_SETTINGS_TYPE_IMAGES, "", false));
-  pref_content_settings_provider.SetContentSetting(
+  pref_content_settings_provider.SetWebsiteSetting(
       pattern2,
       pattern2,
       CONTENT_SETTINGS_TYPE_IMAGES,
       "",
-      CONTENT_SETTING_BLOCK);
+      value_block.get());
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(
                 &pref_content_settings_provider,
                 host3, host3, CONTENT_SETTINGS_TYPE_IMAGES, "", false));
 
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
             GetContentSetting(&pref_content_settings_provider,
                               host4, host4, CONTENT_SETTINGS_TYPE_IMAGES, "",
                               false));
-  pref_content_settings_provider.SetContentSetting(
+  pref_content_settings_provider.SetWebsiteSetting(
       pattern3,
       pattern3,
       CONTENT_SETTINGS_TYPE_IMAGES,
       "",
-      CONTENT_SETTING_BLOCK);
+      value_block.get());
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(
                 &pref_content_settings_provider,
                 host4, host4, CONTENT_SETTINGS_TYPE_IMAGES, "", 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));
-  pref_content_settings_provider.SetContentSetting(
+  pref_content_settings_provider.SetWebsiteSetting(
       pattern,
       pattern,
       CONTENT_SETTINGS_TYPE_PLUGINS,
       resource1,
-      CONTENT_SETTING_BLOCK);
+      value_block.get());
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             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));
@@ skipping 62 matching lines @@
   // Assert pre-condition.
   const DictionaryValue* patterns =
       prefs->GetDictionary(prefs::kContentSettingsPatterns);
   ASSERT_TRUE(patterns->empty());
 
   // Simulate a user setting a content setting.
   ContentSettingsPattern primary_pattern =
       ContentSettingsPattern::FromString("[*.]example.com");
   ContentSettingsPattern secondary_pattern =
       ContentSettingsPattern::Wildcard();
-  provider.SetContentSetting(primary_pattern,
+  provider.SetWebsiteSetting(primary_pattern,
                              secondary_pattern,
                              CONTENT_SETTINGS_TYPE_JAVASCRIPT,
                              std::string(),
-                             CONTENT_SETTING_BLOCK);
+                             value_block.get());
 
   // Test whether the obsolete preference is synced correctly.
   patterns = prefs->GetDictionary(prefs::kContentSettingsPatterns);
   EXPECT_EQ(1U, patterns->size());
   DictionaryValue* settings = NULL;
   patterns->GetDictionaryWithoutPathExpansion(primary_pattern.ToString(),
                                               &settings);
   ASSERT_TRUE(NULL != settings);
   ASSERT_EQ(1U, settings->size());
   int setting_value;
@@ skipping 241 matching lines @@
 
   EXPECT_EQ(CONTENT_SETTING_DEFAULT,
             GetContentSetting(
                 &provider,
                 primary_url,
                 primary_url,
                 CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
                 std::string(),
                 false));
 
-  provider.SetContentSetting(
+  provider.SetWebsiteSetting(
       ContentSettingsPattern::FromURL(primary_url),
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
       std::string(),
-      CONTENT_SETTING_ALLOW);
+      value_allow.get());
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             GetContentSetting(
                 &provider,
                 primary_url,
                 secondary_url,
                 CONTENT_SETTINGS_TYPE_AUTO_SELECT_CERTIFICATE,
                 std::string(),
                 false));
   provider.ShutdownOnUIThread();
 }
@@ skipping 164 matching lines @@
     DictionaryValue* mutable_settings = update.Get();
     mutable_settings->SetWithoutPathExpansion("www.example.com,*",
                                               new base::DictionaryValue());
   }
   EXPECT_TRUE(observer.notification_received());
 
   provider.ShutdownOnUIThread();
 }
 
 }  // namespace content_settings