HostContentSettingsMap refactoring.

chrome/browser/content_settings/content_settings_pref_provider.cc

Index: chrome/browser/content_settings/content_settings_pref_provider.cc
diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc
index 4a896b367ac45a964777941e661e1237e7eb6575..7fe8eefc5a5ab6e835716dbeb876e4e5f4d357d3 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider.cc
@@ -45,6 +45,7 @@ const char* kResourceTypeNames[] = {
   NULL,
   NULL,  // Not used for Notifications
   NULL,  // Not used for Intents.
+  NULL,
 };
 COMPILE_ASSERT(arraysize(kResourceTypeNames) == CONTENT_SETTINGS_NUM_TYPES,
                resource_type_names_incorrect_size);
@@ -59,6 +60,7 @@ const ContentSetting kDefaultSettings[] = {
   CONTENT_SETTING_ASK,    // CONTENT_SETTINGS_TYPE_GEOLOCATION
   CONTENT_SETTING_ASK,    // CONTENT_SETTINGS_TYPE_NOTIFICATIONS
   CONTENT_SETTING_ASK,    // CONTENT_SETTINGS_TYPE_INTENTS
+  CONTENT_SETTING_ALLOW,  // CONTENT_SETTINGS_TYPE_COOKIES_SESSION_ONLY
 };
 COMPILE_ASSERT(arraysize(kDefaultSettings) == CONTENT_SETTINGS_NUM_TYPES,
                default_settings_incorrect_size);
@@ -75,6 +77,7 @@ const char* kTypeNames[] = {
   // for notifications added next.
   "notifications",  // Only used for default Notifications settings.
   "intents",
+  "cookies-session-only",
 };
 COMPILE_ASSERT(arraysize(kTypeNames) == CONTENT_SETTINGS_NUM_TYPES,
                type_names_incorrect_size);