[Reland] Enable AutoResize for Constrained Web Dialogs for Mac.

chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm

 // 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/constrained_window/constrained_window_mac.h"
 
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 61 matching lines @@
   BrowserWindowController* controller_;
   NSView* tab_view0_;
   NSView* tab_view1_;
 };
 
 // Test that a sheet added to a inactive tab is not shown until the
 // tab is activated.
 IN_PROC_BROWSER_TEST_F(ConstrainedWindowMacTest, ShowInInactiveTab) {
   // Show dialog in non active tab.
   NiceMock<ConstrainedWindowDelegateMock> delegate;
-  ConstrainedWindowMac dialog(&delegate, tab0_, sheet_);
+  std::unique_ptr<ConstrainedWindowMac> dialog(
+      CreateAndShowWebModalDialogMac(&delegate, tab0_, sheet_));
   EXPECT_EQ(0.0, [sheet_window_ alphaValue]);
 
   // Switch to inactive tab.
   browser()->tab_strip_model()->ActivateTabAt(0, true);
   EXPECT_EQ(1.0, [sheet_window_ alphaValue]);
 
-  dialog.CloseWebContentsModalDialog();
+  dialog->CloseWebContentsModalDialog();
 }
 
 // If a tab has never been shown then the associated tab view for the web
 // content will not be created. Verify that adding a constrained window to such
 // a tab works correctly.
 IN_PROC_BROWSER_TEST_F(ConstrainedWindowMacTest, ShowInUninitializedTab) {
   scoped_ptr<content::WebContents> web_contents(content::WebContents::Create(
       content::WebContents::CreateParams(browser()->profile())));
   bool was_blocked = false;
   chrome::AddWebContents(browser(), NULL, web_contents.release(),
                          NEW_BACKGROUND_TAB, gfx::Rect(), false, &was_blocked);
   content::WebContents* tab2 =
       browser()->tab_strip_model()->GetWebContentsAt(2);
   ASSERT_TRUE(tab2);
   EXPECT_FALSE([tab2->GetNativeView() superview]);
 
   // Show dialog and verify that it's not visible yet.
   NiceMock<ConstrainedWindowDelegateMock> delegate;
-  ConstrainedWindowMac dialog(&delegate, tab2, sheet_);
+  std::unique_ptr<ConstrainedWindowMac> dialog(
+      CreateAndShowWebModalDialogMac(&delegate, tab2, sheet_));
   EXPECT_FALSE([sheet_window_ isVisible]);
 
   // Activate the tab and verify that the constrained window is shown.
   browser()->tab_strip_model()->ActivateTabAt(2, true);
   EXPECT_TRUE([tab2->GetNativeView() superview]);
   EXPECT_TRUE([sheet_window_ isVisible]);
   EXPECT_EQ(1.0, [sheet_window_ alphaValue]);
 
-  dialog.CloseWebContentsModalDialog();
+  dialog->CloseWebContentsModalDialog();
 }
 
 // Test that adding a sheet disables tab dragging.
 IN_PROC_BROWSER_TEST_F(ConstrainedWindowMacTest, TabDragging) {
   NiceMock<ConstrainedWindowDelegateMock> delegate;
-  ConstrainedWindowMac dialog(&delegate, tab1_, sheet_);
+  std::unique_ptr<ConstrainedWindowMac> dialog(
+      CreateAndShowWebModalDialogMac(&delegate, tab1_, sheet_));
 
   // Verify that the dialog disables dragging.
   EXPECT_TRUE([controller_ isTabDraggable:tab_view0_]);
   EXPECT_FALSE([controller_ isTabDraggable:tab_view1_]);
 
-  dialog.CloseWebContentsModalDialog();
+  dialog->CloseWebContentsModalDialog();
 }
 
 // Test that closing a browser window with a sheet works.
 IN_PROC_BROWSER_TEST_F(ConstrainedWindowMacTest, BrowserWindowClose) {
   NiceMock<ConstrainedWindowDelegateMock> delegate;
-  ConstrainedWindowMac dialog(&delegate, tab1_, sheet_);
+  CreateAndShowWebModalDialogMac(&delegate, tab1_, sheet_);
   EXPECT_EQ(1.0, [sheet_window_ alphaValue]);
 
   // Close the browser window.
   base::scoped_nsobject<NSWindow> browser_window(
       [browser()->window()->GetNativeWindow() retain]);
   EXPECT_TRUE([browser_window isVisible]);
   [browser()->window()->GetNativeWindow() performClose:nil];
   EXPECT_FALSE([browser_window isVisible]);
 }
 
 // Test that closing a tab with a sheet works.
 IN_PROC_BROWSER_TEST_F(ConstrainedWindowMacTest, TabClose) {
   NiceMock<ConstrainedWindowDelegateMock> delegate;
-  ConstrainedWindowMac dialog(&delegate, tab1_, sheet_);
+  CreateAndShowWebModalDialogMac(&delegate, tab1_, sheet_);
   EXPECT_EQ(1.0, [sheet_window_ alphaValue]);
 
   // Close the tab.
   TabStripModel* tab_strip = browser()->tab_strip_model();
   EXPECT_EQ(2, tab_strip->count());
   EXPECT_TRUE(tab_strip->CloseWebContentsAt(1,
                                             TabStripModel::CLOSE_USER_GESTURE));
   EXPECT_EQ(1, tab_strip->count());
 }
 
 // Test that the sheet is still visible after entering and exiting fullscreen.
 IN_PROC_BROWSER_TEST_F(ConstrainedWindowMacTest, BrowserWindowFullscreen) {
   NiceMock<ConstrainedWindowDelegateMock> delegate;
-  ConstrainedWindowMac dialog(&delegate, tab1_, sheet_);
+  std::unique_ptr<ConstrainedWindowMac> dialog(
+      CreateAndShowWebModalDialogMac(&delegate, tab1_, sheet_));
   EXPECT_EQ(1.0, [sheet_window_ alphaValue]);
 
   // Toggle fullscreen twice: one for entering and one for exiting.
   // Check to see if the sheet is visible.
   for (int i = 0; i < 2; i++) {
     {
       // NOTIFICATION_FULLSCREEN_CHANGED is sent asynchronously. Wait for the
       // notification before testing the sheet's visibility.
       scoped_ptr<FullscreenNotificationObserver> waiter(
           new FullscreenNotificationObserver());
       browser()
           ->exclusive_access_manager()
           ->fullscreen_controller()
           ->ToggleBrowserFullscreenMode();
       waiter->Wait();
     }
     EXPECT_EQ(1.0, [sheet_window_ alphaValue]);
   }
 
-  dialog.CloseWebContentsModalDialog();
+  dialog->CloseWebContentsModalDialog();
 }