[MD settings] content category policy

chrome/browser/ui/webui/settings/site_settings_handler_unittest.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 <memory>
 
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/ui/webui/site_settings_helper.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_web_ui.h"
 #include "extensions/common/extension_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const char kCallbackId[] = "test-callback-id";
+const char kSetting[] = "setting";
+const char kSource[] = "source";
 
 }
 
 namespace settings {
 
 class SiteSettingsHandlerTest : public testing::Test {
  public:
   SiteSettingsHandlerTest() : handler_(&profile_) {}
 
   void SetUp() override {
     handler()->set_web_ui(web_ui());
     handler()->AllowJavascript();
     web_ui()->ClearTrackedCalls();
   }
 
   Profile* profile() { return &profile_; }
   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());
 
     const content::TestWebUI::CallData& data = *web_ui()->call_data().back();
     EXPECT_EQ("cr.webUIResponse", data.function_name());
 
     std::string callback_id;
     ASSERT_TRUE(data.arg1()->GetAsString(&callback_id));
     EXPECT_EQ(kCallbackId, callback_id);
 
     bool success = false;
     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(
       const std::string& expected_origin,
       const std::string& expected_embedding,
       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());
 
@@ skipping 130 matching lines @@
   content::TestWebUI web_ui_;
   SiteSettingsHandler handler_;
 };
 
 TEST_F(SiteSettingsHandlerTest, GetAndSetDefault) {
   // Test the JS -> C++ -> JS callback path for getting and setting defaults.
   base::ListValue getArgs;
   getArgs.AppendString(kCallbackId);
   getArgs.AppendString("notifications");
   handler()->HandleGetDefaultValueForContentType(&getArgs);
-  ValidateDefault("ask", 1U);
+  ValidateDefault("ask", "default", 1U);
 
   // Set the default to 'Blocked'.
   base::ListValue setArgs;
   setArgs.AppendString("notifications");
   setArgs.AppendString("block");
   handler()->HandleSetDefaultValueForContentType(&setArgs);
 
   EXPECT_EQ(2U, web_ui()->call_data().size());
 
   // Verify that the default has been set to 'Blocked'.
   handler()->HandleGetDefaultValueForContentType(&getArgs);
-  ValidateDefault("block", 3U);
+  ValidateDefault("block", "default", 3U);
 }
 
 TEST_F(SiteSettingsHandlerTest, Origins) {
   // Test the JS -> C++ -> JS callback path for configuring origins, by setting
   // Google.com to blocked.
   base::ListValue setArgs;
   std::string google("http://www.google.com");
   setArgs.AppendString(google);  // Primary pattern.
   setArgs.AppendString(google);  // Secondary pattern.
   setArgs.AppendString("notifications");
@@ skipping 119 matching lines @@
   args.AppendString("http://www.google.com");
   handler()->HandleRemoveZoomLevel(&args);
   ValidateZoom("", "", 3U);
 
   double default_level = host_zoom_map->GetDefaultZoomLevel();
   double level = host_zoom_map->GetZoomLevelForHostAndScheme("http", host);
   EXPECT_EQ(default_level, level);
 }
 
 }  // namespace settings