[MD settings] content category policy

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

 // Copyright 2016 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/ui/webui/settings/site_settings_handler.h"
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 379 matching lines @@
   CHECK(args->Get(0, &callback_id));
   std::string type;
   CHECK(args->GetString(1, &type));
 
   ContentSettingsType content_type =
       static_cast<ContentSettingsType>(static_cast<int>(
           site_settings::ContentSettingsTypeFromGroupName(type)));
   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) {
   AllowJavascript();
 
   CHECK_EQ(2U, args->GetSize());
   const base::Value* callback_id;
   CHECK(args->Get(0, &callback_id));
   std::string type;
   CHECK(args->GetString(1, &type));
@@ skipping 275 matching lines @@
     origin = content::kUnreachableWebDataURL;
   }
 
   content::HostZoomMap* host_zoom_map;
   host_zoom_map = content::HostZoomMap::GetDefaultForBrowserContext(profile_);
   double default_level = host_zoom_map->GetDefaultZoomLevel();
   host_zoom_map->SetZoomLevelForHost(origin, default_level);
 }
 
 }  // namespace settings