MD Settings: Amend SiteSettingsHandlerTest.Origins to test "Site Details" code.

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 "base/test/histogram_tester.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 214 matching lines @@
   content::TestWebUI web_ui_;
   SiteSettingsHandler handler_;
 #if defined(OS_CHROMEOS)
   chromeos::MockUserManager* mock_user_manager_;  // Not owned.
   std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
 #endif
 };
 
 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);
+  base::ListValue get_args;
+  get_args.AppendString(kCallbackId);
+  get_args.AppendString("notifications");
+  handler()->HandleGetDefaultValueForContentType(&get_args);
   ValidateDefault("ask", "default", 1U);
 
   // Set the default to 'Blocked'.
-  base::ListValue setArgs;
-  setArgs.AppendString("notifications");
-  setArgs.AppendString("block");
-  handler()->HandleSetDefaultValueForContentType(&setArgs);
+  base::ListValue set_args;
+  set_args.AppendString("notifications");
+  set_args.AppendString("block");
+  handler()->HandleSetDefaultValueForContentType(&set_args);
 
   EXPECT_EQ(2U, web_ui()->call_data().size());
 
   // Verify that the default has been set to 'Blocked'.
-  handler()->HandleGetDefaultValueForContentType(&getArgs);
+  handler()->HandleGetDefaultValueForContentType(&get_args);
   ValidateDefault("block", "default", 3U);
 }
 
 TEST_F(SiteSettingsHandlerTest, Origins) {
   // Test the JS -> C++ -> JS callback path for configuring origins, by setting
   // Google.com to blocked.
   const std::string google("http://www.google.com");
   const std::string kUmaBase("WebsiteSettings.Menu.PermissionChanged");
   {
     base::ListValue set_args;
     set_args.AppendString(google);  // Primary pattern.
     set_args.AppendString(google);  // Secondary pattern.
     set_args.AppendString("notifications");
     set_args.AppendString("block");
     set_args.AppendBoolean(false);  // Incognito.
     base::HistogramTester histograms;
     handler()->HandleSetCategoryPermissionForOrigin(&set_args);
     EXPECT_EQ(1U, web_ui()->call_data().size());
     histograms.ExpectTotalCount(kUmaBase, 1);
     histograms.ExpectTotalCount(kUmaBase + ".Allowed", 0);
     histograms.ExpectTotalCount(kUmaBase + ".Blocked", 1);
     histograms.ExpectTotalCount(kUmaBase + ".Reset", 0);
   }
 
-  // Verify the change was successful.
-  base::ListValue listArgs;
-  listArgs.AppendString(kCallbackId);
-  listArgs.AppendString("notifications");
-  handler()->HandleGetExceptionList(&listArgs);
+  // If the change was successful, it should show up in the response from
+  // getExceptionList() as well as getOriginPermissions().
+  // Check getOriginPermissions().
+  base::ListValue get_origin_permissions_args;
+  get_origin_permissions_args.AppendString(kCallbackId);
+  get_origin_permissions_args.AppendString(google);
+  {
+    auto category_list = base::MakeUnique<base::ListValue>();
+    category_list->AppendString("notifications");
+    get_origin_permissions_args.Append(std::move(category_list));
+  }
+  handler()->HandleGetOriginPermissions(&get_origin_permissions_args);
   ValidateOrigin(google, google, google, "block", "preference", 2U);
 
+  // Check getExceptionList().
+  base::ListValue get_exception_list_args;
+  get_exception_list_args.AppendString(kCallbackId);
+  get_exception_list_args.AppendString("notifications");
+  handler()->HandleGetExceptionList(&get_exception_list_args);
+  ValidateOrigin(google, google, google, "block", "preference", 3U);
+
   {
     // Reset things back to how they were.
     base::ListValue reset_args;
     reset_args.AppendString(google);
     reset_args.AppendString(google);
     reset_args.AppendString("notifications");
     reset_args.AppendBoolean(false);  // Incognito.
     base::HistogramTester histograms;
     handler()->HandleResetCategoryPermissionForOrigin(&reset_args);
-    EXPECT_EQ(3U, web_ui()->call_data().size());
+    EXPECT_EQ(4U, web_ui()->call_data().size());
     histograms.ExpectTotalCount(kUmaBase, 1);
     histograms.ExpectTotalCount(kUmaBase + ".Allowed", 0);
     histograms.ExpectTotalCount(kUmaBase + ".Blocked", 0);
     histograms.ExpectTotalCount(kUmaBase + ".Reset", 1);
   }
 
   // Verify the reset was successful.
-  handler()->HandleGetExceptionList(&listArgs);
-  ValidateNoOrigin(4U);
+  handler()->HandleGetExceptionList(&get_exception_list_args);
+  ValidateNoOrigin(5U);
+
+  handler()->HandleGetOriginPermissions(&get_origin_permissions_args);
+  // "Ask" is the default value for Notifications.
+  ValidateOrigin(google, google, google, "ask", "preference", 6U);
 }
 
 TEST_F(SiteSettingsHandlerTest, ExceptionHelpers) {
   ContentSettingsPattern pattern =
       ContentSettingsPattern::FromString("[*.]google.com");
   std::unique_ptr<base::DictionaryValue> exception =
       site_settings::GetExceptionForPage(pattern, pattern, pattern.ToString(),
                                          CONTENT_SETTING_BLOCK, "preference",
                                          false);
 
@@ skipping 98 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