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

chrome/browser/ui/views/extensions/media_galleries_dialog_views.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/extensions/media_galleries_dialog_views.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #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"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/scroll_view.h"
@@ skipping 49 matching lines @@
 }
 
 MediaGalleriesDialogViews::~MediaGalleriesDialogViews() {
   if (!ControllerHasWebContents())
     delete contents_;
 }
 
 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() {
   // Outer dialog layout.
   contents_->RemoveAllChildViews(true);
   checkbox_map_.clear();
 
   int dialog_content_width = views::Widget::GetLocalizedContentsWidth(
       IDS_MEDIA_GALLERIES_DIALOG_CONTENT_WIDTH_CHARS);
   views::GridLayout* layout = views::GridLayout::CreatePanel(contents_);
@@ skipping 229 matching lines @@
   return controller_->WebContents() != NULL;
 }
 
 // MediaGalleriesDialogViewsController -----------------------------------------
 
 // static
 MediaGalleriesDialog* MediaGalleriesDialog::Create(
     MediaGalleriesDialogController* controller) {
   return new MediaGalleriesDialogViews(controller);
 }