Add content_settings::PrefProvider to HostContentSettingsMap.

chrome/browser/content_settings/host_content_settings_map_unittest.cc

 // Copyright (c) 2010 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/host_content_settings_map_unittest.h"
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 380 matching lines @@
 
 TEST_F(HostContentSettingsMapTest, NestedSettings) {
   TestingProfile profile;
   HostContentSettingsMap* host_content_settings_map =
       profile.GetHostContentSettingsMap();
 
   GURL host("http://a.b.example.com/");
   ContentSettingsPattern pattern1("[*.]example.com");
   ContentSettingsPattern pattern2("[*.]b.example.com");
   ContentSettingsPattern pattern3("a.b.example.com");
-

[jochen (gone - plz use gerrit), 2011/02/04 08:38:43]

please don't remove this lines

[markusheintz_, 2011/02/04 10:08:03]

Done.

   host_content_settings_map->SetContentSetting(pattern1,
       CONTENT_SETTINGS_TYPE_IMAGES, "", CONTENT_SETTING_BLOCK);
   host_content_settings_map->SetContentSetting(pattern2,
       CONTENT_SETTINGS_TYPE_COOKIES, "", CONTENT_SETTING_BLOCK);
   host_content_settings_map->SetContentSetting(pattern3,
       CONTENT_SETTINGS_TYPE_PLUGINS, "", CONTENT_SETTING_BLOCK);
   host_content_settings_map->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_JAVASCRIPT, CONTENT_SETTING_BLOCK);
-
   ContentSettings desired_settings;
   desired_settings.settings[CONTENT_SETTINGS_TYPE_COOKIES] =
       CONTENT_SETTING_BLOCK;
   desired_settings.settings[CONTENT_SETTINGS_TYPE_IMAGES] =
       CONTENT_SETTING_BLOCK;
   desired_settings.settings[CONTENT_SETTINGS_TYPE_JAVASCRIPT] =
       CONTENT_SETTING_BLOCK;
   desired_settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS] =
       CONTENT_SETTING_BLOCK;
   desired_settings.settings[CONTENT_SETTINGS_TYPE_POPUPS] =
@@ skipping 187 matching lines @@
             host_content_settings_map->GetContentSetting(
                 host, CONTENT_SETTINGS_TYPE_PLUGINS, resource1));
   host_content_settings_map->SetContentSetting(pattern,
       CONTENT_SETTINGS_TYPE_PLUGINS, resource1, CONTENT_SETTING_BLOCK);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,
             host_content_settings_map->GetContentSetting(
                 host, CONTENT_SETTINGS_TYPE_PLUGINS, resource1));
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 host, CONTENT_SETTINGS_TYPE_PLUGINS, resource2));
+
+  // If resource content settings are enable GetContentSettings should return
+  // CONTENT_SETTING_DEFAULT for content types that require resource
+  // identifiers.
+  ContentSettings settings =
+      host_content_settings_map->GetContentSettings(host);
+  EXPECT_EQ(CONTENT_SETTING_DEFAULT,
+            settings.settings[CONTENT_SETTINGS_TYPE_PLUGINS]);
 }
 
 TEST_F(HostContentSettingsMapTest, ResourceIdentifierPrefs) {
   // This feature is currently behind a flag.
   CommandLine* cmd = CommandLine::ForCurrentProcess();
   AutoReset<CommandLine> auto_reset(cmd, *cmd);
   cmd->AppendSwitch(switches::kEnableResourceContentSettings);
 
   TestingProfile profile;
   scoped_ptr<Value> value(base::JSONReader::Read(
@@ skipping 216 matching lines @@
   EXPECT_TRUE(host_content_settings_map->BlockThirdPartyCookies());
 
   // After unsetting the managed value for the preference BlockThirdPartyCookies
   // the default value should be returned now.
   prefs->RemoveManagedPref(prefs::kBlockThirdPartyCookies);
   EXPECT_FALSE(host_content_settings_map->IsBlockThirdPartyCookiesManaged());
   EXPECT_FALSE(host_content_settings_map->BlockThirdPartyCookies());
 }
 
 }  // namespace