Added tests for views flavor of MediaGalleriesDialogTest.

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 "components/web_modal/web_contents_modal_dialog_host.h"
 #include "components/web_modal/web_contents_modal_dialog_manager.h"
@@ skipping 61 matching lines @@
 MediaGalleriesDialogViews::MediaGalleriesDialogViews(
     MediaGalleriesDialogController* controller)
     : controller_(controller),
       window_(NULL),
       contents_(new views::View()),
       add_gallery_button_(NULL),
       confirm_available_(false),
       accepted_(false) {
   InitChildViews();
 
-  // Ownership of |contents_| is handed off by this call. |window_| will take
-  // care of deleting itself after calling DeleteDelegate().
-  WebContentsModalDialogManager* web_contents_modal_dialog_manager =
-      WebContentsModalDialogManager::FromWebContents(
-          controller->web_contents());
-  DCHECK(web_contents_modal_dialog_manager);
-  WebContentsModalDialogManagerDelegate* modal_delegate =
-      web_contents_modal_dialog_manager->delegate();
-  DCHECK(modal_delegate);
-  window_ = views::Widget::CreateWindowAsFramelessChild(
-      this, modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
-  web_contents_modal_dialog_manager->ShowDialog(window_->GetNativeView());
+  // May be NULL during tests.
+  if (controller->web_contents()) {
+    // Ownership of |contents_| is handed off by this call. |window_| will take
+    // care of deleting itself after calling DeleteDelegate().
+    // TODO(scr): Ensure contents_ is really deleted.

[vandebo (ex-Chrome), 2014/02/11 18:26:24]

Please resolve this before commit.

[Sheridan Rawlins, 2014/02/13 04:57:20]

Done.

+    WebContentsModalDialogManager* web_contents_modal_dialog_manager =
+        WebContentsModalDialogManager::FromWebContents(
+            controller->web_contents());
+    DCHECK(web_contents_modal_dialog_manager);
+    WebContentsModalDialogManagerDelegate* modal_delegate =
+        web_contents_modal_dialog_manager->delegate();
+    DCHECK(modal_delegate);
+    window_ = views::Widget::CreateWindowAsFramelessChild(
+        this, modal_delegate->GetWebContentsModalDialogHost()->GetHostView());
+    web_contents_modal_dialog_manager->ShowDialog(window_->GetNativeView());
+  }
 }
 
 MediaGalleriesDialogViews::~MediaGalleriesDialogViews() {}
 
 void MediaGalleriesDialogViews::InitChildViews() {
   // Outer dialog layout.
   contents_->RemoveAllChildViews(true);
   int dialog_content_width = views::Widget::GetLocalizedContentsWidth(
       IDS_MEDIA_GALLERIES_DIALOG_CONTENT_WIDTH_CHARS);
   views::GridLayout* layout = views::GridLayout::CreatePanel(contents_);
@@ skipping 217 matching lines @@
 // on all dialogs.
 views::NonClientFrameView* MediaGalleriesDialogViews::CreateNonClientFrameView(
     views::Widget* widget) {
   return CreateConstrainedStyleNonClientFrameView(
       widget,
       controller_->web_contents()->GetBrowserContext());
 }
 
 void MediaGalleriesDialogViews::ButtonPressed(views::Button* sender,
                                               const ui::Event& event) {
+  GetWidget()->client_view()->AsDialogClientView()->UpdateDialogButtons();
+
+  ButtonPressedAction(sender);
+}
+
+void MediaGalleriesDialogViews::ButtonPressedAction(views::Button* sender) {
   confirm_available_ = true;
-  GetWidget()->client_view()->AsDialogClientView()->UpdateDialogButtons();
 
   if (sender == add_gallery_button_) {
     controller_->OnAddFolderClicked();
     return;
   }
 
   for (CheckboxMap::const_iterator iter = checkbox_map_.begin();
        iter != checkbox_map_.end(); ++iter) {
     if (sender == iter->second) {
       controller_->DidToggleGalleryId(iter->first,
@@ skipping 37 matching lines @@
   }
 }
 
 // MediaGalleriesDialogViewsController -----------------------------------------
 
 // static
 MediaGalleriesDialog* MediaGalleriesDialog::Create(
     MediaGalleriesDialogController* controller) {
   return new MediaGalleriesDialogViews(controller);
 }