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

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 "chrome/browser/content_settings/content_settings_default_provider.h"
 #include "chrome/browser/content_settings/content_settings_mock_observer.h"
 #include "chrome/browser/content_settings/content_settings_utils.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/test/test_browser_thread.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::_;
 using content::BrowserThread;
 
 class DefaultProviderTest : public testing::Test {
  public:
   DefaultProviderTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         provider_(profile_.GetPrefs(), false) {
+    value_allow.reset(Value::CreateIntegerValue(CONTENT_SETTING_ALLOW));
+    value_block.reset(Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));
   }
   ~DefaultProviderTest() {
     provider_.ShutdownOnUIThread();
   }
 
  protected:
   MessageLoop message_loop_;
   content::TestBrowserThread ui_thread_;
   TestingProfile profile_;
   content_settings::DefaultProvider provider_;
+  scoped_ptr<base::Value> value_allow;

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

Class member names should end with an underscore.

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

Yeah so true :( . But I don't need this any more.

+  scoped_ptr<base::Value> value_block;
 };
 
 TEST_F(DefaultProviderTest, DefaultValues) {
   // Check setting defaults.
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             GetContentSetting(&provider_,
                               GURL(),
                               GURL(),
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
                               false));
-  provider_.SetContentSetting(ContentSettingsPattern::Wildcard(),
+  provider_.SetWebsiteSetting(ContentSettingsPattern::Wildcard(),
                               ContentSettingsPattern::Wildcard(),
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
-                              CONTENT_SETTING_BLOCK);
+                              value_block.get());
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&provider_,
                               GURL(),
                               GURL(),
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
                               false));
 
   EXPECT_EQ(CONTENT_SETTING_ASK,
             GetContentSetting(&provider_,
                               GURL(),
                               GURL(),
                               CONTENT_SETTINGS_TYPE_GEOLOCATION,
                               std::string(),
                               false));
-  provider_.SetContentSetting(ContentSettingsPattern::Wildcard(),
+  provider_.SetWebsiteSetting(ContentSettingsPattern::Wildcard(),
                               ContentSettingsPattern::Wildcard(),
                               CONTENT_SETTINGS_TYPE_GEOLOCATION,
                               std::string(),
-                              CONTENT_SETTING_BLOCK);
+                              value_block.get());
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&provider_,
                               GURL(),
                               GURL(),
                               CONTENT_SETTINGS_TYPE_GEOLOCATION,
                               std::string(),
                               false));
 }
 
 TEST_F(DefaultProviderTest, IgnoreNonDefaultSettings) {
   GURL primary_url("http://www.google.com");
   GURL secondary_url("http://www.google.com");
 
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             GetContentSetting(&provider_,
                               primary_url,
                               secondary_url,
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
                               false));
-  provider_.SetContentSetting(ContentSettingsPattern::FromURL(primary_url),
+  provider_.SetWebsiteSetting(ContentSettingsPattern::FromURL(primary_url),
                               ContentSettingsPattern::FromURL(secondary_url),
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
-                              CONTENT_SETTING_BLOCK);
+                              value_block.get());
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             GetContentSetting(&provider_,
                               primary_url,
                               secondary_url,
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
                               false));
 }
 
 TEST_F(DefaultProviderTest, Observer) {
   content_settings::MockObserver mock_observer;
   EXPECT_CALL(mock_observer,
               OnContentSettingChanged(
                   _, _, CONTENT_SETTINGS_TYPE_IMAGES, ""));
   provider_.AddObserver(&mock_observer);
-  provider_.SetContentSetting(ContentSettingsPattern::Wildcard(),
+  provider_.SetWebsiteSetting(ContentSettingsPattern::Wildcard(),
                               ContentSettingsPattern::Wildcard(),
                               CONTENT_SETTINGS_TYPE_IMAGES,
                               std::string(),
-                              CONTENT_SETTING_BLOCK);
+                              value_block.get());
 
   EXPECT_CALL(mock_observer,
               OnContentSettingChanged(
                   _, _, CONTENT_SETTINGS_TYPE_GEOLOCATION, ""));
-  provider_.SetContentSetting(ContentSettingsPattern::Wildcard(),
+  provider_.SetWebsiteSetting(ContentSettingsPattern::Wildcard(),
                               ContentSettingsPattern::Wildcard(),
                               CONTENT_SETTINGS_TYPE_GEOLOCATION,
                               std::string(),
-                              CONTENT_SETTING_BLOCK);
+                              value_block.get());
 }
 
 
 TEST_F(DefaultProviderTest, ObserveDefaultPref) {
   PrefService* prefs = profile_.GetPrefs();
 
   // Make a copy of the default pref value so we can reset it later.
   scoped_ptr<Value> default_value(prefs->FindPreference(
       prefs::kDefaultContentSettings)->GetValue()->DeepCopy());
 
-  provider_.SetContentSetting(ContentSettingsPattern::Wildcard(),
+  provider_.SetWebsiteSetting(ContentSettingsPattern::Wildcard(),
                               ContentSettingsPattern::Wildcard(),
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
-                              CONTENT_SETTING_BLOCK);
+                              value_block.get());
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&provider_,
                               GURL(),
                               GURL(),
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
                               false));
 
   // Make a copy of the pref's new value so we can reset it later.
   scoped_ptr<Value> new_value(prefs->FindPreference(
@@ skipping 32 matching lines @@
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             GetContentSetting(&otr_provider,
                               GURL(),
                               GURL(),
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
                               true));
 
   // Changing content settings on the main provider should also affect the
   // incognito map.
-  provider_.SetContentSetting(ContentSettingsPattern::Wildcard(),
+  provider_.SetWebsiteSetting(ContentSettingsPattern::Wildcard(),
                               ContentSettingsPattern::Wildcard(),
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
-                              CONTENT_SETTING_BLOCK);
+                              value_block.get());
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&provider_,
                               GURL(),
                               GURL(),
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
                               false));
 
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&otr_provider,
                               GURL(),
                               GURL(),
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
                               true));
 
   // Changing content settings on the incognito provider should be ignored.
-  otr_provider.SetContentSetting(ContentSettingsPattern::Wildcard(),
+  otr_provider.SetWebsiteSetting(ContentSettingsPattern::Wildcard(),
                                  ContentSettingsPattern::Wildcard(),
                                  CONTENT_SETTINGS_TYPE_COOKIES,
                                  std::string(),
-                                 CONTENT_SETTING_ALLOW);
+                                 value_allow.get());
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&provider_,
                               GURL(),
                               GURL(),
                               CONTENT_SETTINGS_TYPE_COOKIES,
                               std::string(),
                               false));
 
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             GetContentSetting(&otr_provider,
@@ skipping 50 matching lines @@
 
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             GetContentSetting(&provider,
                               GURL(),
                               GURL(),
                               CONTENT_SETTINGS_TYPE_GEOLOCATION,
                               std::string(),
                               false));
   provider.ShutdownOnUIThread();
 }