Site Settings Desktop: Support adding exceptions for incognito mode.

chrome/browser/ui/webui/options/content_settings_handler.cc

Index: chrome/browser/ui/webui/options/content_settings_handler.cc
diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc
index 071a24e705a6fa114f303c38f559900c879306e5..e909c5f8bc2c5460248e5ff910bd96735db46c62 100644
--- a/chrome/browser/ui/webui/options/content_settings_handler.cc
+++ b/chrome/browser/ui/webui/options/content_settings_handler.cc
@@ -948,7 +948,8 @@ void ContentSettingsHandler::CompareMediaExceptionsWithFlash(
 
   base::ListValue exceptions;
   site_settings::GetExceptionsFromHostContentSettingsMap(settings_map, type,
-                                                         web_ui(), &exceptions);
+                                                         web_ui(), false,

[stevenjb, 2016/09/01 15:47:55]

false /* not incognito */ here and elsewhere.

[Finnur, 2016/09/01 16:48:17]

Done.

+                                                         &exceptions);
 
   settings.exceptions.clear();
   for (base::ListValue::const_iterator entry = exceptions.begin();
@@ -1093,7 +1094,8 @@ void ContentSettingsHandler::UpdateExceptionsViewFromHostContentSettingsMap(
   HostContentSettingsMap* settings_map =
       HostContentSettingsMapFactory::GetForProfile(GetProfile());
   site_settings::GetExceptionsFromHostContentSettingsMap(settings_map, type,
-                                                         web_ui(), &exceptions);
+                                                         web_ui(), false,
+                                                         &exceptions);
   base::StringValue type_string(
       site_settings::ContentSettingsTypeToGroupName(type));
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setExceptions",
@@ -1129,7 +1131,7 @@ void ContentSettingsHandler::UpdateExceptionsViewFromOTRHostContentSettingsMap(
     return;
   base::ListValue exceptions;
   site_settings::GetExceptionsFromHostContentSettingsMap(
-      otr_settings_map, type, web_ui(), &exceptions);
+      otr_settings_map, type, web_ui(), true, &exceptions);
   base::StringValue type_string(
       site_settings::ContentSettingsTypeToGroupName(type));
   web_ui()->CallJavascriptFunctionUnsafe("ContentSettings.setOTRExceptions",