Share TabFirstRenderWatcher with HtmlDialogView.

chrome/browser/ui/webui/constrained_html_ui_browsertest.cc

Index: chrome/browser/ui/webui/constrained_html_ui_browsertest.cc
diff --git a/chrome/browser/ui/webui/constrained_html_ui_browsertest.cc b/chrome/browser/ui/webui/constrained_html_ui_browsertest.cc
index c70ad0a66c2f3640fd21642c7b168ae1b90fe34f..e70534a242fa7ae4a1169ec040590fac01f32d54 100644
--- a/chrome/browser/ui/webui/constrained_html_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/constrained_html_ui_browsertest.cc
@@ -9,7 +9,7 @@
 #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/html_dialog_ui.h"
+#include "chrome/browser/ui/webui/test_html_dialog_ui_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"
@@ -18,39 +18,6 @@
 
 namespace {
 
-class TestHtmlDialogUIDelegate : public HtmlDialogUIDelegate {
- public:
-  TestHtmlDialogUIDelegate() {}
-  virtual ~TestHtmlDialogUIDelegate() {}
-
-  // HTMLDialogUIDelegate implementation:
-  virtual bool IsDialogModal() const OVERRIDE {
-    return true;
-  }
-  virtual string16 GetDialogTitle() const OVERRIDE {
-    return UTF8ToUTF16("Test");
-  }
-  virtual GURL GetDialogContentURL() const OVERRIDE {
-    return GURL(chrome::kChromeUIConstrainedHTMLTestURL);
-  }
-  virtual void GetWebUIMessageHandlers(
-      std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE {}
-  virtual void GetDialogSize(gfx::Size* size) const OVERRIDE {
-    size->set_width(400);
-    size->set_height(400);
-  }
-  virtual std::string GetDialogArgs() const OVERRIDE {
-    return std::string();
-  }
-  virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE { }
-  virtual void OnCloseContents(TabContents* source, bool* out_close_dialog)
-      OVERRIDE {
-    if (out_close_dialog)
-      *out_close_dialog = true;
-  }
-  virtual bool ShouldShowDialogTitle() const OVERRIDE { return true; }
-};
-
 class ConstrainedHtmlDialogBrowserTestObserver : public TabContentsObserver {
  public:
   explicit ConstrainedHtmlDialogBrowserTestObserver(TabContents* contents)
@@ -84,7 +51,8 @@ class ConstrainedHtmlDialogBrowserTest : public InProcessBrowserTest {
 // Tests that opening/closing the constrained window won't crash it.
 IN_PROC_BROWSER_TEST_F(ConstrainedHtmlDialogBrowserTest, BasicTest) {
   // The delegate deletes itself.
-  HtmlDialogUIDelegate* delegate = new TestHtmlDialogUIDelegate();
+  HtmlDialogUIDelegate* delegate = new test::TestHtmlDialogUIDelegate(
+      GURL(chrome::kChromeUIConstrainedHTMLTestURL));
   TabContentsWrapper* wrapper = browser()->GetSelectedTabContentsWrapper();
   ASSERT_TRUE(wrapper);
 
@@ -101,7 +69,8 @@ IN_PROC_BROWSER_TEST_F(ConstrainedHtmlDialogBrowserTest, BasicTest) {
 IN_PROC_BROWSER_TEST_F(ConstrainedHtmlDialogBrowserTest,
                        ReleaseTabContentsOnDialogClose) {
   // The delegate deletes itself.
-  TestHtmlDialogUIDelegate* delegate = new TestHtmlDialogUIDelegate();
+  HtmlDialogUIDelegate* delegate = new test::TestHtmlDialogUIDelegate(
+      GURL(chrome::kChromeUIConstrainedHTMLTestURL));
   TabContentsWrapper* wrapper = browser()->GetSelectedTabContentsWrapper();
   ASSERT_TRUE(wrapper);