Upstream version 10.38.220.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / extensions / media_galleries_dialog_views.cc

diff --git a/src/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc b/src/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
index 4ab4050..b51d739 100644 (file)
--- a/src/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
+++ b/src/chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc
@@ -9,7 +9,7 @@
 #include "chrome/browser/ui/views/extensions/media_gallery_checkbox_view.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/grit/locale_settings.h"
-#include "components/web_modal/popup_manager.h"
+#include "components/web_modal/web_contents_modal_dialog_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/native_theme/native_theme.h"
@@ -79,10 +79,12 @@ MediaGalleriesDialogViews::~MediaGalleriesDialogViews() {
 void MediaGalleriesDialogViews::AcceptDialogForTesting() {
   accepted_ = true;
 
-  web_modal::PopupManager* popup_manager =
-      web_modal::PopupManager::FromWebContents(controller_->WebContents());
-  DCHECK(popup_manager);
-  popup_manager->CloseAllDialogsForTesting(controller_->WebContents());
+  web_modal::WebContentsModalDialogManager* web_contents_modal_dialog_manager =
+      web_modal::WebContentsModalDialogManager::FromWebContents(
+          controller_->WebContents());
+  DCHECK(web_contents_modal_dialog_manager);
+  web_modal::WebContentsModalDialogManager::TestApi(
+      web_contents_modal_dialog_manager).CloseAllDialogs();
 }
 
 void MediaGalleriesDialogViews::InitChildViews() {