[MD settings] content category policy

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

Index: chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc
diff --git a/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc b/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc
index bad38882ad06ba40cdfe63837e3bf207767b22d4..7413ed6e78f8245e95d0c520519d90f511989db6 100644
--- a/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc
+++ b/chrome/browser/ui/webui/settings/site_settings_handler_unittest.cc
@@ -21,6 +21,8 @@
 namespace {
 
 const char kCallbackId[] = "test-callback-id";
+const char kSetting[] = "setting";
+const char kSource[] = "source";
 
 }
 
@@ -40,7 +42,8 @@ class SiteSettingsHandlerTest : public testing::Test {
   content::TestWebUI* web_ui() { return &web_ui_; }
   SiteSettingsHandler* handler() { return &handler_; }
 
-  void ValidateDefault(const std::string& expected_default,
+  void ValidateDefault(const std::string& expected_setting,
+                       const std::string& expected_source,
                        size_t expected_total_calls) {
     EXPECT_EQ(expected_total_calls, web_ui()->call_data().size());
 
@@ -55,9 +58,14 @@ class SiteSettingsHandlerTest : public testing::Test {
     ASSERT_TRUE(data.arg2()->GetAsBoolean(&success));
     ASSERT_TRUE(success);
 
-    std::string default_value;
-    ASSERT_TRUE(data.arg3()->GetAsString(&default_value));
-    EXPECT_EQ(expected_default, default_value);
+    const base::DictionaryValue* default_value = NULL;

[Dan Beam, 2016/11/29 05:17:14]

use nullptr instead of NULL in new code

[dschuyler, 2016/11/29 22:28:12]

Done.

+    ASSERT_TRUE(data.arg3()->GetAsDictionary(&default_value));
+    std::string setting;
+    ASSERT_TRUE(default_value->GetString(kSetting, &setting));
+    EXPECT_EQ(expected_setting, setting);
+    std::string source;
+    ASSERT_TRUE(default_value->GetString(kSource, &source));
+    EXPECT_EQ(expected_source, source);
   }
 
   void ValidateOrigin(
@@ -208,7 +216,7 @@ TEST_F(SiteSettingsHandlerTest, GetAndSetDefault) {
   getArgs.AppendString(kCallbackId);
   getArgs.AppendString("notifications");
   handler()->HandleGetDefaultValueForContentType(&getArgs);
-  ValidateDefault("ask", 1U);
+  ValidateDefault("ask", "default", 1U);
 
   // Set the default to 'Blocked'.
   base::ListValue setArgs;
@@ -220,7 +228,7 @@ TEST_F(SiteSettingsHandlerTest, GetAndSetDefault) {
 
   // Verify that the default has been set to 'Blocked'.
   handler()->HandleGetDefaultValueForContentType(&getArgs);
-  ValidateDefault("block", 3U);
+  ValidateDefault("block", "default", 3U);
 }
 
 TEST_F(SiteSettingsHandlerTest, Origins) {