HostContentSettingsMap refactoring.

chrome/browser/content_settings/content_settings_policy_provider.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_policy_provider.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 32 matching lines @@
   ContentSetting setting;
 };
 
 const PrefsForManagedContentSettingsMapEntry
     kPrefsForManagedContentSettingsMap[] = {
   {
     prefs::kManagedCookiesAllowedForUrls,
     CONTENT_SETTINGS_TYPE_COOKIES,
     CONTENT_SETTING_ALLOW
   }, {
+    prefs::kManagedCookiesAllowedForUrls,
+    CONTENT_SETTINGS_TYPE_PERMANENT_COOKIES,
+    CONTENT_SETTING_ALLOW
+  }, {
+    prefs::kManagedCookiesSessionOnlyForUrls,
+    CONTENT_SETTINGS_TYPE_COOKIES,
+    CONTENT_SETTING_ALLOW
+  }, {
     prefs::kManagedCookiesSessionOnlyForUrls,

[Bernhard Bauer, 2011/09/14 16:01:36]

Wait, this doesn't seem quite right. Some of the prefs are duplicate, and the
mapping to content settings looks wrong as well.

-    CONTENT_SETTINGS_TYPE_COOKIES,
-    CONTENT_SETTING_SESSION_ONLY
+    CONTENT_SETTINGS_TYPE_PERMANENT_COOKIES,
+    CONTENT_SETTING_BLOCK
   }, {
     prefs::kManagedCookiesBlockedForUrls,
     CONTENT_SETTINGS_TYPE_COOKIES,
     CONTENT_SETTING_BLOCK
   }, {
     prefs::kManagedImagesAllowedForUrls,
     CONTENT_SETTINGS_TYPE_IMAGES,
     CONTENT_SETTING_ALLOW
   }, {
     prefs::kManagedImagesBlockedForUrls,
@@ skipping 476 matching lines @@
                       ContentSettingsPattern(),
                       CONTENT_SETTINGS_TYPE_DEFAULT,
                       std::string());
     }
   } else {
     NOTREACHED() << "Unexpected notification";
   }
 }
 
 }  // namespace content_settings