Split the aggregate dictionary of content settings exceptions into per-type dictionaries

chrome/browser/content_settings/host_content_settings_map_unittest.cc

Index: chrome/browser/content_settings/host_content_settings_map_unittest.cc
diff --git a/chrome/browser/content_settings/host_content_settings_map_unittest.cc b/chrome/browser/content_settings/host_content_settings_map_unittest.cc
index 001ca3b2219b4f72803a21af03d090ceda02278f..c252c094b1fd4930a007e495f421a85e66a6c4f9 100644
--- a/chrome/browser/content_settings/host_content_settings_map_unittest.cc
+++ b/chrome/browser/content_settings/host_content_settings_map_unittest.cc
@@ -387,12 +387,16 @@ TEST_F(HostContentSettingsMapTest, ObserveExceptionPref) {
   scoped_ptr<base::Value> new_value(prefs->FindPreference(
       prefs::kContentSettingsPatternPairs)->GetValue()->DeepCopy());
 
+  LOG(ERROR) << "About to clear.";

[raymes, 2015/04/01 06:51:20]

nit: Are you intentionally adding this?

+
   // Clearing the backing pref should also clear the internal cache.
   prefs->Set(prefs::kContentSettingsPatternPairs, *default_value);
   EXPECT_EQ(CONTENT_SETTING_ALLOW,
             host_content_settings_map->GetContentSetting(
                 host, host, CONTENT_SETTINGS_TYPE_IMAGES, std::string()));
 
+  LOG(ERROR) << "About to repopulate";
+
   // Reseting the pref to its previous value should update the cache.
   prefs->Set(prefs::kContentSettingsPatternPairs, *new_value);
   EXPECT_EQ(CONTENT_SETTING_BLOCK,