[MD settings] content category policy

chrome/browser/ui/webui/settings/site_settings_handler.cc

Index: chrome/browser/ui/webui/settings/site_settings_handler.cc
diff --git a/chrome/browser/ui/webui/settings/site_settings_handler.cc b/chrome/browser/ui/webui/settings/site_settings_handler.cc
index 71d5f144c607e1f73669a0ca3df838326d92b6ae..4605ff9853572db0391920a82d0a2305ea298f06 100644
--- a/chrome/browser/ui/webui/settings/site_settings_handler.cc
+++ b/chrome/browser/ui/webui/settings/site_settings_handler.cc
@@ -397,9 +397,9 @@ void SiteSettingsHandler::HandleGetDefaultValueForContentType(
   HostContentSettingsMap* map =
       HostContentSettingsMapFactory::GetForProfile(profile_);
 
-  std::string setting = content_settings::ContentSettingToString(
-      map->GetDefaultContentSetting(content_type, nullptr));
-  ResolveJavascriptCallback(*callback_id, base::StringValue(setting));
+  std::unique_ptr<base::DictionaryValue> category(new base::DictionaryValue);

[Dan Beam, 2016/11/17 22:33:38]

nit: can we just do stack construction instead?  i.e.

base::DictionaryValue category;
site_settings::GetContentCategorySetting(map, content_type, &category);
ResolveJavascriptCallback(*callback_id, category);

[dschuyler, 2016/11/18 02:11:56]

Done.

+  site_settings::GetContentCategorySetting(map, content_type, category.get());
+  ResolveJavascriptCallback(*callback_id, *category.get());

[tommycli, 2016/11/18 00:09:26]

I think you will have to update the unit test here:
https://cs.chromium.org/chromium/src/chrome/browser/ui/webui/settings/site_se...

To validate against the new DictionaryValue instead of the StringValue for the
3rd argument. (The second argument is created by the body of
ResolveJavascriptCallback, so *category.get() here will become the 3rd argument)

[dschuyler, 2016/11/18 02:11:56]

Thanks Tommy.

Done.

 }
 
 void SiteSettingsHandler::HandleGetExceptionList(const base::ListValue* args) {