Add new Content settings type AUTO-SUBMIT-CERTIFICATE

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 "chrome/browser/content_settings/content_settings_mock_observer.h"
 #include "chrome/browser/prefs/browser_prefs.h"
@@ skipping 149 matching lines @@
 
   // Change obsolete preference and test if it migrated correctly.
   prefs->SetInteger(prefs::kGeolocationDefaultContentSetting,
                     CONTENT_SETTING_BLOCK);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             provider.ProvideDefaultSetting(CONTENT_SETTINGS_TYPE_GEOLOCATION));
 
   provider.ShutdownOnUIThread();
 }
 
+TEST_F(PrefDefaultProviderTest, AutoSubmitCertificateContentSetting) {
+  TestingProfile profile;
+  TestingPrefService* prefs = profile.GetTestingPrefService();
+
+  PrefDefaultProvider provider(prefs, false);
+
+  EXPECT_EQ(CONTENT_SETTING_BLOCK,
+            provider.ProvideDefaultSetting(
+                CONTENT_SETTINGS_TYPE_AUTO_SUBMIT_CERTIFICATE));
+  provider.UpdateDefaultSetting(
+      CONTENT_SETTINGS_TYPE_AUTO_SUBMIT_CERTIFICATE, CONTENT_SETTING_ALLOW);
+  EXPECT_EQ(CONTENT_SETTING_ALLOW,
+            provider.ProvideDefaultSetting(
+                CONTENT_SETTINGS_TYPE_AUTO_SUBMIT_CERTIFICATE));
+  provider.ShutdownOnUIThread();
+}
+
 // ////////////////////////////////////////////////////////////////////////////
 // PrefProviderTest
 //
 
 bool SettingsEqual(const ContentSettings& settings1,
                    const ContentSettings& settings2) {
   for (int i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
     if (settings1.settings[i] != settings2.settings[i])
       return false;
   }
@@ skipping 302 matching lines @@
                                               &settings);
   ASSERT_TRUE(NULL != settings) << "Dictionary has no key: "
                                 << primary_pattern.ToString();
   ASSERT_EQ(1U, settings->size());
   settings->GetInteger("javascript", &setting_value);
   EXPECT_EQ(setting_value, CONTENT_SETTING_ALLOW);
 
   provider.ShutdownOnUIThread();
 }
 
+TEST_F(PrefProviderTest, AutoSubmitCertificateContentSetting) {
+  TestingProfile profile;
+  TestingPrefService* prefs = profile.GetTestingPrefService();
+  GURL primary_url("http://www.example.com");
+  GURL secondary_url("http://www.sample.com");
+
+  PrefProvider provider(prefs, false);
+
+  EXPECT_EQ(CONTENT_SETTING_DEFAULT,
+            provider.GetContentSetting(
+                primary_url,
+                primary_url,
+                CONTENT_SETTINGS_TYPE_AUTO_SUBMIT_CERTIFICATE,
+                std::string()));

[wtc, 2011/08/11 18:33:55]

Why is the expected value CONTENT_SETTING_DEFAULT here?
(I am not familiar content settings.)

[markusheintz_, 2011/08/15 19:09:04]

We have two kinds of content settings provider: DefaultContentSettingsProvider
and ContentSettingsProvider for origin specific settings. (FYI: I'm working on
getting rid of the (legacy) default content settings provider as they are not
unnecessary anymore. They will be integrated into the ContentSettingsProvider).
If the content_settings::PrefProvider does not contain an origin specific
setting, then it returns CONTENT_SETTING_DEFAULT to indicate that the default
setting applies (which will be do not auto-submit a cert).

+
+  provider.SetContentSetting(
+      ContentSettingsPattern::FromURL(primary_url),
+      ContentSettingsPattern::Wildcard(),
+      CONTENT_SETTINGS_TYPE_AUTO_SUBMIT_CERTIFICATE,
+      std::string(),
+      CONTENT_SETTING_ALLOW);
+  EXPECT_EQ(CONTENT_SETTING_ALLOW,
+            provider.GetContentSetting(
+                primary_url,
+                secondary_url,
+                CONTENT_SETTINGS_TYPE_AUTO_SUBMIT_CERTIFICATE,
+                std::string()));
+  provider.ShutdownOnUIThread();
+}
+
 }  // namespace content_settings