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 28bac4cffa8042a7f7afe27ab6b7a6dd3d044db6..78949fe85dbd31f39b0bd166c6b4c1721fc45c2d 100644 |
--- a/chrome/test/data/webui/certificate_viewer_ui_test-inl.h |
+++ b/chrome/test/data/webui/certificate_viewer_ui_test-inl.h |
@@ -5,6 +5,7 @@ |
#include "chrome/browser/certificate_viewer.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/browser/ui/browser_window.h" |
+#include "chrome/browser/ui/webui/certificate_viewer_webui.h" |
#include "chrome/browser/ui/webui/web_ui_browsertest.h" |
#include "chrome/common/url_constants.h" |
#include "chrome/test/base/test_web_dialog_observer.h" |
@@ -34,7 +35,11 @@ void CertificateViewerUITest::ShowCertificateViewer() { |
ASSERT_TRUE(browser()->window()); |
TestWebDialogObserver dialog_observer(this); |
- ::ShowCertificateViewer(browser()->window()->GetNativeHandle(), google_cert); |
+ CertificateViewerDialog* dialog = new CertificateViewerDialog( |
+ google_cert); |
+ dialog->AddObserver(&dialog_observer); |
+ dialog->Show(browser()->window()->GetNativeHandle()); |
+ dialog->RemoveObserver(&dialog_observer); |
content::WebUI* webui = dialog_observer.GetWebUI(); |
webui->GetWebContents()->GetRenderViewHost()->SetWebUIProperty( |
"expectedUrl", chrome::kChromeUICertificateViewerURL); |