Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5194)

Unified Diff: chrome/test/data/webui/certificate_viewer_ui_test-inl.h

Issue 8586009: Allow WebUI Tests to use preLoad in HtmlDialogUI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address more comments from James. Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..8ec38cc7a8853d08a3f56ce0c46e89a92f373bdb 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:
+ void ShowCertificateViewer();
};
-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);

Powered by Google App Engine
This is Rietveld 408576698