Track the original opener of a webcontents so we can rely on it for popups

chrome/browser/ui/blocked_content/app_modal_dialog_helper.cc

Index: chrome/browser/ui/blocked_content/app_modal_dialog_helper.cc
diff --git a/chrome/browser/ui/blocked_content/app_modal_dialog_helper.cc b/chrome/browser/ui/blocked_content/app_modal_dialog_helper.cc
index 888c38ad458e396742d96ded873ba6fdab3b9433..9ec1116eedde1c9c05c740df3877f5c622399755 100644
--- a/chrome/browser/ui/blocked_content/app_modal_dialog_helper.cc
+++ b/chrome/browser/ui/blocked_content/app_modal_dialog_helper.cc
@@ -36,7 +36,7 @@ AppModalDialogHelper::AppModalDialogHelper(content::WebContents* dialog_host)
     content::WebContents* active_web_contents =
         active_browser->tab_strip_model()->GetActiveWebContents();
     if (active_browser->is_type_popup() && active_web_contents &&
-        active_web_contents->GetOpener() == actual_host) {
+        active_web_contents->GetOriginalOpener() == actual_host) {
       // It's indeed a popup from the dialog opening WebContents. Store it, so
       // we can focus it later.
       popup_ = active_web_contents;