Re-Revert "[WebModals] New API for browser-scoped popup management."

chrome/browser/ui/views/desktop_media_picker_views.cc

Index: chrome/browser/ui/views/desktop_media_picker_views.cc
diff --git a/chrome/browser/ui/views/desktop_media_picker_views.cc b/chrome/browser/ui/views/desktop_media_picker_views.cc
index 1f239448ecfc3c6abdd97eb97f9f22df4b24a7d7..234a5bc218e37bcd8e9618ad595d72c05369fcfb 100644
--- a/chrome/browser/ui/views/desktop_media_picker_views.cc
+++ b/chrome/browser/ui/views/desktop_media_picker_views.cc
@@ -9,7 +9,7 @@
 #include "chrome/browser/ui/ash/ash_util.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "chrome/grit/generated_resources.h"
-#include "components/web_modal/popup_manager.h"
+#include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
@@ -421,10 +421,10 @@ DesktopMediaPickerDialogView::DesktopMediaPickerDialogView(
   list_view_->StartUpdating(dialog_window_id);
 
   if (modal_dialog) {
-    web_modal::PopupManager* popup_manager =
-        web_modal::PopupManager::FromWebContents(parent_web_contents);
-    popup_manager->ShowModalDialog(GetWidget()->GetNativeView(),
-                                   parent_web_contents);
+    web_modal::WebContentsModalDialogManager* manager =
+        web_modal::WebContentsModalDialogManager::FromWebContents(
+            parent_web_contents);
+    manager->ShowModalDialog(widget->GetNativeView());
   } else {
     widget->Show();
   }