Split incognito extension content settings in session-only and persistent.

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 160 matching lines @@
     } else if (*name == prefs::kManagedDefaultPluginsSetting) {
       UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_PLUGINS);
     } else if (*name == prefs::kManagedDefaultPopupsSetting) {
       UpdateManagedDefaultSetting(CONTENT_SETTINGS_TYPE_POPUPS);
     } else {
       NOTREACHED() << "Unexpected preference observed";
       return;
     }
 
     if (!is_off_the_record_) {
-      NotifyObservers(ContentSettingsDetails(
-            ContentSettingsPattern(), CONTENT_SETTINGS_TYPE_DEFAULT, ""));
+      ContentSettingsDetails details(ContentSettingsPattern(),
+                                     CONTENT_SETTINGS_TYPE_DEFAULT,
+                                     std::string());
+      NotifyObservers(details);
     }
   } else if (type == NotificationType::PROFILE_DESTROYED) {
     DCHECK_EQ(profile_, Source<Profile>(source).ptr());
     UnregisterObservers();
   } else {
     NOTREACHED() << "Unexpected notification";
   }
 }
 
 void PolicyDefaultProvider::UnregisterObservers() {
@@ skipping 248 matching lines @@
         *name == prefs::kManagedCookiesSessionOnlyForUrls ||
         *name == prefs::kManagedImagesAllowedForUrls ||
         *name == prefs::kManagedImagesBlockedForUrls ||
         *name == prefs::kManagedJavaScriptAllowedForUrls ||
         *name == prefs::kManagedJavaScriptBlockedForUrls ||
         *name == prefs::kManagedPluginsAllowedForUrls ||
         *name == prefs::kManagedPluginsBlockedForUrls ||
         *name == prefs::kManagedPopupsAllowedForUrls ||
         *name == prefs::kManagedPopupsBlockedForUrls) {
       ReadManagedContentSettings(true);
-      NotifyObservers(ContentSettingsDetails(
-          ContentSettingsPattern(), CONTENT_SETTINGS_TYPE_DEFAULT, ""));
+      ContentSettingsDetails details(ContentSettingsPattern(),
+                                     CONTENT_SETTINGS_TYPE_DEFAULT,
+                                     std::string());
+      NotifyObservers(details);
     }
   } else if (type == NotificationType::PROFILE_DESTROYED) {
     DCHECK_EQ(profile_, Source<Profile>(source).ptr());
     UnregisterObservers();
   } else {
     NOTREACHED() << "Unexpected notification";
   }
 }
 
 }  // namespace content_settings