Bugfix: Popup blocker default state not considered

This change addresses an issue in which, when the context URL is not
available, popups continue to be blocked despite disabling popup
blocking.

Bug: 1128530
Change-Id: Ie25127f44da29a88e479ad1eca14ea3a69221b8d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2425127Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Sam Sebree <sasebree@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#810788}

chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc

@@ -461,6 +461,17 @@ IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, NoPopupsLaunchWhenTabIsClosed) {
   ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile()));
 }
 
+IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
+                       PopupsAllowedWhenPopupBlockingIsDisabled) {
+  base::CommandLine::ForCurrentProcess()->AppendSwitch(
+      embedder_support::kDisablePopupBlocking);
+
+  GURL url(
+      embedded_test_server()->GetURL("/popup_blocker/popup-window-open.html"));
+
+  NavigateAndCheckPopupShown(url, kExpectPopup);
+}
+
 // This only exists for the AllowPopupsWhenTabIsClosedWithSpecialPolicy test.
 // Remove this in Chrome 88. https://crbug.com/937569
 class PopupBlockerSpecialPolicyBrowserTest : public PopupBlockerBrowserTest {

components/blocked_content/popup_blocker.cc

@@ -42,12 +42,18 @@ PopupBlockType ShouldBlockPopup(content::WebContents* web_contents,
   // unloading page.
   const GURL& url =
       opener_url ? *opener_url : web_contents->GetLastCommittedURL();
-  if (url.is_valid() &&
-      settings_map->GetContentSetting(url, url, ContentSettingsType::POPUPS,
-                                      std::string()) == CONTENT_SETTING_ALLOW) {
-    return PopupBlockType::kNotBlocked;
+  ContentSetting cs;
+  if (url.is_valid()) {
+    cs = settings_map->GetContentSetting(url, url, ContentSettingsType::POPUPS,
+                                         std::string());
+  } else {
+    cs = settings_map->GetDefaultContentSetting(ContentSettingsType::POPUPS,
+                                                nullptr);
   }
 
+  if (cs == CONTENT_SETTING_ALLOW)
+    return PopupBlockType::kNotBlocked;
+
   if (!user_gesture)
     return PopupBlockType::kNoGesture;