Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8026)

Unified Diff: chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm

Issue 11369253: Fix crash when programatically closing media gallery dialog (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm
diff --git a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm
new file mode 100644
index 0000000000000000000000000000000000000000..23865ee925b143a65b52e0d7385b0ff5fcba9f7f
--- /dev/null
+++ b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_browsertest.mm
@@ -0,0 +1,48 @@
+// 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/cocoa/extensions/media_galleries_dialog_cocoa.h"
+
+#include "chrome/browser/media_gallery/media_galleries_dialog_controller_mock.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/browser/ui/constrained_window_tab_helper.h"
+#include "chrome/test/base/in_process_browser_test.h"
+#include "content/public/test/test_utils.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+using ::testing::NiceMock;
+using ::testing::Return;
+using ::testing::ReturnRef;
+
+namespace chrome {
+
+class MediaGalleriesDialogBrowserTest : public InProcessBrowserTest {
+};
+
+// Verify that programatically closing the constrained window correctly closes
+// the sheet.
+IN_PROC_BROWSER_TEST_F(MediaGalleriesDialogBrowserTest, Close) {
Avi (use Gerrit) 2012/11/14 21:17:41 Whoooooo!
+ NiceMock<MediaGalleriesDialogControllerMock> controller;
+
+ content::WebContents* web_contents = chrome::GetActiveWebContents(browser());
+ EXPECT_CALL(controller, web_contents()).
+ WillRepeatedly(Return(web_contents));
+
+ MediaGalleriesDialogController::KnownGalleryPermissions permissions;
+ EXPECT_CALL(controller, permissions()).
+ WillRepeatedly(ReturnRef(permissions));
+
+ scoped_ptr<MediaGalleriesDialogCocoa> dialog(
+ static_cast<MediaGalleriesDialogCocoa*>(
+ MediaGalleriesDialog::Create(&controller)));
+ scoped_nsobject<NSWindow> window([[dialog->alert_ window] retain]);
+ EXPECT_TRUE([window isVisible]);
+
+ ConstrainedWindowTabHelper* constrained_window_tab_helper =
+ ConstrainedWindowTabHelper::FromWebContents(web_contents);
+ constrained_window_tab_helper->CloseConstrainedWindows();
+ EXPECT_FALSE([window isVisible]);
+}
+
+} // namespace chrome
« no previous file with comments | « chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698