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

Unified Diff: chrome/browser/ui/webui/web_ui_browsertest.cc

Issue 7861024: Adds testing infrastructure to web_ui_browsertest to support testing HtmlDialogs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add description of what triggers notifications and why it's not a race condition. Created 9 years, 3 months 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/browser/ui/webui/web_ui_browsertest.cc
diff --git a/chrome/browser/ui/webui/web_ui_browsertest.cc b/chrome/browser/ui/webui/web_ui_browsertest.cc
index 3130446c876a6f39270e088ac58650d5a2cddd17..2497b604d2b428d7c74d2a63fd46f928ec14e69c 100644
--- a/chrome/browser/ui/webui/web_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/web_ui_browsertest.cc
@@ -207,7 +207,8 @@ const char WebUIBrowserTest::kDummyURL[] = "chrome://DummyURL";
WebUIBrowserTest::WebUIBrowserTest()
: test_handler_(new WebUITestHandler()),
- libraries_preloaded_(false) {}
+ libraries_preloaded_(false),
+ web_ui_instance_(NULL) {}
namespace {
@@ -254,6 +255,10 @@ void WebUIBrowserTest::TearDownInProcessBrowserTestFixture() {
TestChromeWebUIFactory::RemoveFactoryOverride(GURL(kDummyURL).host());
}
+void WebUIBrowserTest::SetWebUIInstance(WebUI* web_ui) {
+ web_ui_instance_ = web_ui;
+}
+
WebUIMessageHandler* WebUIBrowserTest::GetMockMessageHandler() {
return NULL;
}
@@ -363,7 +368,7 @@ bool WebUIBrowserTest::RunJavascriptUsingHandler(
}
void WebUIBrowserTest::SetupHandlers() {
- WebUI* web_ui_instance =
+ WebUI* web_ui_instance = web_ui_instance_ ? web_ui_instance_ :
browser()->GetSelectedTabContents()->web_ui();
ASSERT_TRUE(web_ui_instance != NULL);
web_ui_instance->set_register_callback_overwrites(true);

Powered by Google App Engine
This is Rietveld 408576698