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

chrome/browser/ui/web_contents_modal_dialog_manager_unittest.cc

Index: chrome/browser/ui/web_contents_modal_dialog_manager_unittest.cc
diff --git a/chrome/browser/ui/constrained_window_tab_helper_unittest.cc b/chrome/browser/ui/web_contents_modal_dialog_manager_unittest.cc
similarity index 53%
rename from chrome/browser/ui/constrained_window_tab_helper_unittest.cc
rename to chrome/browser/ui/web_contents_modal_dialog_manager_unittest.cc
index 2ff348b014c2524afe1452ce8a0652f019c60f57..e990254448979ddfd7f036d96561339574008b48 100644
--- a/chrome/browser/ui/constrained_window_tab_helper_unittest.cc
+++ b/chrome/browser/ui/web_contents_modal_dialog_manager_unittest.cc
@@ -2,62 +2,70 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/constrained_window.h"
-#include "chrome/browser/ui/constrained_window_tab_helper.h"
+#include "chrome/browser/ui/web_contents_modal_dialog.h"
+#include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::BrowserThread;
 
-class ConstrainedWindowTabHelperTest : public ChromeRenderViewHostTestHarness {
+class WebContentsModalDialogManagerTest
+    : public ChromeRenderViewHostTestHarness {
  public:
-  ConstrainedWindowTabHelperTest()
+  WebContentsModalDialogManagerTest()
       : ChromeRenderViewHostTestHarness(),
         ui_thread_(BrowserThread::UI, &message_loop_) {
   }
 
   virtual void SetUp() {
     ChromeRenderViewHostTestHarness::SetUp();
-    ConstrainedWindowTabHelper::CreateForWebContents(web_contents());
+    WebContentsModalDialogManager::CreateForWebContents(web_contents());
   }
 
  private:
   content::TestBrowserThread ui_thread_;
 };
 
-class WebContentsModalDialogCloseTest : public ConstrainedWindow {
+class WebContentsModalDialogCloseTest : public WebContentsModalDialog {
  public:
   explicit WebContentsModalDialogCloseTest(content::WebContents* web_contents)
       : web_contents_(web_contents) {
   }
 
   virtual void ShowWebContentsModalDialog() {}
-  virtual void FocusWebContentsModalDialog() {}
-  virtual ~WebContentsModalDialogCloseTest() {}
-
   virtual void CloseWebContentsModalDialog() {
-    ConstrainedWindowTabHelper* constrained_window_tab_helper =
-        ConstrainedWindowTabHelper::FromWebContents(web_contents_);
-    constrained_window_tab_helper->WillClose(this);
+    WebContentsModalDialogManager* web_contents_modal_dialog_manager =
+        WebContentsModalDialogManager::FromWebContents(web_contents_);
+    web_contents_modal_dialog_manager->WillClose(this);
     close_count++;
   }
+  virtual void FocusWebContentsModalDialog() {}
+  virtual void PulseWebContentsModalDialog() {}
+  virtual bool CanShowWebContentsModalDialog() {
+    return true;
+  }
+  virtual gfx::NativeWindow GetNativeWindow() {
+    NOTREACHED();
+    return NULL;
+  }
+  virtual ~WebContentsModalDialogCloseTest() {}
 
   int close_count;
   content::WebContents* web_contents_;
 };
 
-TEST_F(ConstrainedWindowTabHelperTest, ConstrainedWindows) {
+TEST_F(WebContentsModalDialogManagerTest, ConstrainedWindows) {
   WebContentsModalDialogCloseTest window(web_contents());
   window.close_count = 0;
-  ConstrainedWindowTabHelper* constrained_window_tab_helper =
-      ConstrainedWindowTabHelper::FromWebContents(web_contents());
+  WebContentsModalDialogManager* web_contents_modal_dialog_manager =
+      WebContentsModalDialogManager::FromWebContents(web_contents());
 
   const int kWindowCount = 4;
   for (int i = 0; i < kWindowCount; i++)
-    constrained_window_tab_helper->AddDialog(&window);
+    web_contents_modal_dialog_manager->AddDialog(&window);
   EXPECT_EQ(window.close_count, 0);
 
-  constrained_window_tab_helper->CloseAllDialogs();
+  web_contents_modal_dialog_manager->CloseAllDialogs();
   EXPECT_EQ(window.close_count, kWindowCount);
 }