Allow WebUI Tests to use preLoad in HtmlDialogUI.

chrome/test/data/webui/certificate_viewer_ui_test-inl.h

Index: chrome/test/data/webui/certificate_viewer_ui_test-inl.h
diff --git a/chrome/test/data/webui/certificate_viewer_ui_test-inl.h b/chrome/test/data/webui/certificate_viewer_ui_test-inl.h
index 0e5ef7584f3777fecc13ffced2c76c6bb57e3e44..c3f91a90ac39ea90fd1a8f336188acb88957d0f9 100644
--- a/chrome/test/data/webui/certificate_viewer_ui_test-inl.h
+++ b/chrome/test/data/webui/certificate_viewer_ui_test-inl.h
@@ -22,11 +22,11 @@ class CertificateViewerUITest : public WebUIBrowserTest {
   CertificateViewerUITest();
   virtual ~CertificateViewerUITest();
 
- private:
-  virtual void SetUpOnMainThread() OVERRIDE;
+ protected:
+  virtual void ShowCertificateViewer();

[James Hawkins, 2011/11/22 23:03:29]

Why is this virtual?

[Sheridan Rawlins, 2011/11/23 20:10:07]

No reason - it was left over from when it overrode SetUpOnMainThread().

Done.

 };
 
-void CertificateViewerUITest::SetUpOnMainThread() {
+void CertificateViewerUITest::ShowCertificateViewer() {
   // Enable more WebUI to use WebUI certificate viewer.
   ChromeWebUI::OverrideMoreWebUI(true);
 
@@ -37,8 +37,8 @@ void CertificateViewerUITest::SetUpOnMainThread() {
   ASSERT_TRUE(browser());
   ASSERT_TRUE(browser()->window());
 
-  TestHtmlDialogObserver dialog_observer;
-  ShowCertificateViewer(browser()->window()->GetNativeHandle(), google_cert);
+  TestHtmlDialogObserver dialog_observer(this);
+  ::ShowCertificateViewer(browser()->window()->GetNativeHandle(), google_cert);
   WebUI* webui = dialog_observer.GetWebUI();
   webui->tab_contents()->render_view_host()->SetWebUIProperty(
       "expectedUrl", chrome::kChromeUICertificateViewerURL);