WebDialogs

chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc

Index: chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc
===================================================================
--- chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc	(revision 133680)
+++ chrome/browser/ui/webui/constrained_web_dialog_ui_browsertest.cc	(working copy)
@@ -8,8 +8,8 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/constrained_window_tab_helper.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
-#include "chrome/browser/ui/webui/constrained_html_ui.h"
-#include "chrome/browser/ui/webui/test_html_dialog_ui_delegate.h"
+#include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
+#include "chrome/browser/ui/webui/test_web_dialog_delegate.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ -20,14 +20,14 @@
 
 namespace {
 
-class ConstrainedHtmlDialogBrowserTestObserver
+class ConstrainedWebDialogBrowserTestObserver
     : public content::WebContentsObserver {
  public:
-  explicit ConstrainedHtmlDialogBrowserTestObserver(WebContents* contents)
+  explicit ConstrainedWebDialogBrowserTestObserver(WebContents* contents)
       : content::WebContentsObserver(contents),
         tab_destroyed_(false) {
   }
-  virtual ~ConstrainedHtmlDialogBrowserTestObserver() {}
+  virtual ~ConstrainedWebDialogBrowserTestObserver() {}
 
   bool tab_destroyed() { return tab_destroyed_; }
 
@@ -41,9 +41,9 @@
 
 }  // namespace
 
-class ConstrainedHtmlDialogBrowserTest : public InProcessBrowserTest {
+class ConstrainedWebDialogBrowserTest : public InProcessBrowserTest {
  public:
-  ConstrainedHtmlDialogBrowserTest() {}
+  ConstrainedWebDialogBrowserTest() {}
 
  protected:
   size_t GetConstrainedWindowCount(TabContentsWrapper* wrapper) const {
@@ -52,45 +52,45 @@
 };
 
 // Tests that opening/closing the constrained window won't crash it.
-IN_PROC_BROWSER_TEST_F(ConstrainedHtmlDialogBrowserTest, BasicTest) {
+IN_PROC_BROWSER_TEST_F(ConstrainedWebDialogBrowserTest, BasicTest) {
   // The delegate deletes itself.
-  HtmlDialogUIDelegate* delegate = new test::TestHtmlDialogUIDelegate(
+  WebDialogDelegate* delegate = new test::TestWebDialogDelegate(
       GURL(chrome::kChromeUIConstrainedHTMLTestURL));
   TabContentsWrapper* wrapper = browser()->GetSelectedTabContentsWrapper();
   ASSERT_TRUE(wrapper);
 
-  ConstrainedHtmlUIDelegate* html_ui_delegate =
-      ConstrainedHtmlUI::CreateConstrainedHtmlDialog(browser()->profile(),
-                                                     delegate,
-                                                     NULL,
-                                                     wrapper);
-  ASSERT_TRUE(html_ui_delegate);
-  EXPECT_TRUE(html_ui_delegate->window());
+  ConstrainedWebDialogDelegate* dialog_delegate =
+      ConstrainedWebDialogUI::CreateConstrainedWebDialog(browser()->profile(),
+                                                         delegate,
+                                                         NULL,
+                                                         wrapper);
+  ASSERT_TRUE(dialog_delegate);
+  EXPECT_TRUE(dialog_delegate->window());
   EXPECT_EQ(1U, GetConstrainedWindowCount(wrapper));
 }
 
 // Tests that ReleaseTabContentsOnDialogClose() works.
-IN_PROC_BROWSER_TEST_F(ConstrainedHtmlDialogBrowserTest,
+IN_PROC_BROWSER_TEST_F(ConstrainedWebDialogBrowserTest,
                        ReleaseTabContentsOnDialogClose) {
   // The delegate deletes itself.
-  HtmlDialogUIDelegate* delegate = new test::TestHtmlDialogUIDelegate(
+  WebDialogDelegate* delegate = new test::TestWebDialogDelegate(
       GURL(chrome::kChromeUIConstrainedHTMLTestURL));
   TabContentsWrapper* wrapper = browser()->GetSelectedTabContentsWrapper();
   ASSERT_TRUE(wrapper);
 
-  ConstrainedHtmlUIDelegate* html_ui_delegate =
-      ConstrainedHtmlUI::CreateConstrainedHtmlDialog(browser()->profile(),
-                                                     delegate,
-                                                     NULL,
-                                                     wrapper);
-  ASSERT_TRUE(html_ui_delegate);
-  scoped_ptr<TabContentsWrapper> new_tab(html_ui_delegate->tab());
+  ConstrainedWebDialogDelegate* dialog_delegate =
+      ConstrainedWebDialogUI::CreateConstrainedWebDialog(browser()->profile(),
+                                                         delegate,
+                                                         NULL,
+                                                         wrapper);
+  ASSERT_TRUE(dialog_delegate);
+  scoped_ptr<TabContentsWrapper> new_tab(dialog_delegate->tab());
   ASSERT_TRUE(new_tab.get());
   ASSERT_EQ(1U, GetConstrainedWindowCount(wrapper));
 
-  ConstrainedHtmlDialogBrowserTestObserver observer(new_tab->web_contents());
-  html_ui_delegate->ReleaseTabContentsOnDialogClose();
-  html_ui_delegate->OnDialogCloseFromWebUI();
+  ConstrainedWebDialogBrowserTestObserver observer(new_tab->web_contents());
+  dialog_delegate->ReleaseTabContentsOnDialogClose();
+  dialog_delegate->OnDialogCloseFromWebUI();
 
   ASSERT_FALSE(observer.tab_destroyed());
   EXPECT_EQ(0U, GetConstrainedWindowCount(wrapper));