Reinstate "no popups during close".

BUG=958419, 844455

Change-Id: I0549227aba40f6fd85b9e7b39e719798cd33e0ed
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1730774Reviewed-by: Daniel Cheng <dcheng@chromium.org>
Commit-Queue: Avi Drissman <avi@chromium.org>
Cr-Commit-Position: refs/heads/master@{#694910}

chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc

@@ -431,9 +431,6 @@ IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest,
   ASSERT_EQ(1, GetBlockedContentsCount());
 }
 
-// This feature is being reverted on trunk but an easily-merged CL is needed for
-// merging back to stable. https://crbug.com/936080
-#if 0
 IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, NoPopupsLaunchWhenTabIsClosed) {
   base::CommandLine::ForCurrentProcess()->AppendSwitch(
       switches::kDisablePopupBlocking);
@@ -447,7 +444,6 @@ IN_PROC_BROWSER_TEST_F(PopupBlockerBrowserTest, NoPopupsLaunchWhenTabIsClosed) {
   // Expect no popup.
   ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile()));
 }
-#endif
 
 // This only exists for the AllowPopupsWhenTabIsClosedWithSpecialPolicy test.
 // Remove this in Chrome 82. https://crbug.com/937569

third_party/blink/renderer/core/page/chrome_client.cc

@@ -107,14 +107,10 @@ Page* ChromeClient::CreateWindow(
     WebSandboxFlags sandbox_flags,
     const FeaturePolicy::FeatureState& opener_feature_state,
     const SessionStorageNamespaceId& session_storage_namespace_id) {
-// This feature is being disabled on trunk but an easily-merged CL is needed for
-// merging back to stable. https://crbug.com/936080
-#if 0
   if (!CanOpenUIElementIfDuringPageDismissal(
           frame->Tree().Top(), UIElementType::kPopup, g_empty_string)) {
     return nullptr;
   }
-#endif
 
   return CreateWindowDelegate(frame, r, frame_name, features, sandbox_flags,
                               opener_feature_state,

third_party/blink/web_tests/TestExpectations

@@ -4403,10 +4403,6 @@ crbug.com/888470 external/wpt/referrer-policy/css-integration/child-css/processi
 crbug.com/888470 virtual/omt-worker-fetch/external/wpt/referrer-policy/css-integration/child-css/internal-import-stylesheet.html [ Failure ]
 crbug.com/888470 virtual/omt-worker-fetch/external/wpt/referrer-policy/css-integration/child-css/processing-instruction.html [ Failure ]
 
-# This behavior (popups during unload) is being reverted on trunk; this test is
-# expected to fail when this change is merged back to earlier branches.
-crbug.com/936080 external/wpt/html/browsers/the-window-object/apis-for-creating-and-navigating-browsing-contexts-by-name/no_window_open_when_term_nesting_level_nonzero.window.html [ Failure ]
-
 crbug.com/805756 external/wpt/html/semantics/tabular-data/processing-model-1/span-limits.html [ Pass Timeout ]
 
 crbug.com/666993 [ Debug ] external/wpt/requestidlecallback/callback-idle-periods.html [ Pass Timeout ]