Rename platform-independent ConstrainedWindow types to WebContentsModalDialog types (part 1)

chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm

Index: chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm
diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm
index befcbcce0a37e656bafe2b5d57fe9933174f35e6..7cc0ca383b67b896b471517d3782a4f30edf58fc 100644
--- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm
+++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa_browsertest.mm
@@ -9,7 +9,7 @@
 #include "base/bind.h"
 #include "chrome/browser/ssl/ssl_client_certificate_selector_test.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
-#include "chrome/browser/ui/constrained_window_tab_helper.h"
+#include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
 #include "chrome/browser/ssl/ssl_client_certificate_selector.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
@@ -31,9 +31,9 @@ typedef SSLClientCertificateSelectorTestBase
 
 IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorCocoaTest, Basic) {
   content::WebContents* web_contents = chrome::GetActiveWebContents(browser());
-  ConstrainedWindowTabHelper* constrained_window_tab_helper =
-      ConstrainedWindowTabHelper::FromWebContents(web_contents);
-  EXPECT_EQ(0u, constrained_window_tab_helper->constrained_window_count());
+  WebContentsModalDialogManager* web_contents_modal_dialog_manager =
+      WebContentsModalDialogManager::FromWebContents(web_contents);
+  EXPECT_EQ(0u, web_contents_modal_dialog_manager->dialog_count());
 
   net::X509Certificate* cert = NULL;
   int count = 0;
@@ -47,11 +47,11 @@ IN_PROC_BROWSER_TEST_F(SSLClientCertificateSelectorCocoaTest, Basic) {
   [selector displayForWebContents:web_contents];
   content::RunAllPendingInMessageLoop();
   EXPECT_TRUE([selector panel]);
-  EXPECT_EQ(1u, constrained_window_tab_helper->constrained_window_count());
+  EXPECT_EQ(1u, web_contents_modal_dialog_manager->dialog_count());
 
-  constrained_window_tab_helper->CloseConstrainedWindows();
+  web_contents_modal_dialog_manager->CloseAllDialogs();
   content::RunAllPendingInMessageLoop();
-  EXPECT_EQ(0u, constrained_window_tab_helper->constrained_window_count());
+  EXPECT_EQ(0u, web_contents_modal_dialog_manager->dialog_count());
 
   EXPECT_EQ(NULL, cert);
   EXPECT_EQ(1, count);