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

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

Issue 8586009: Allow WebUI Tests to use preLoad in HtmlDialogUI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revert to patch set 4. 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/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 9049fd897685f0f050987e350f05df930107f0d8..0d5dba215e0577fccc8fc69df2b6b26c028a7b27 100644
--- a/chrome/browser/ui/webui/web_ui_browsertest.cc
+++ b/chrome/browser/ui/webui/web_ui_browsertest.cc
@@ -175,13 +175,7 @@ void WebUIBrowserTest::PreLoadJavascriptLibraries(
libraries_preloaded_ = true;
}
-void WebUIBrowserTest::BrowsePreload(const GURL& browse_to,
- const std::string& preload_test_fixture,
- const std::string& preload_test_name) {
- // Remember for callback OnJsInjectionReady().
- preload_test_fixture_ = preload_test_fixture;
- preload_test_name_ = preload_test_name;
-
+void WebUIBrowserTest::BrowsePreload(const GURL& browse_to) {
TestNavigationObserver navigation_observer(
content::Source<NavigationController>(
&browser()->GetSelectedTabContentsWrapper()->controller()),
@@ -193,14 +187,7 @@ void WebUIBrowserTest::BrowsePreload(const GURL& browse_to,
navigation_observer.WaitForObservation();
}
-void WebUIBrowserTest::BrowsePrintPreload(
- const GURL& browse_to,
- const std::string& preload_test_fixture,
- const std::string& preload_test_name) {
- // Remember for callback OnJsInjectionReady().
- preload_test_fixture_ = preload_test_fixture;
- preload_test_name_ = preload_test_name;
-
+void WebUIBrowserTest::BrowsePrintPreload(const GURL& browse_to) {
ui_test_utils::NavigateToURL(browser(), browse_to);
TestTabStripModelObserver tabstrip_observer(

Powered by Google App Engine
This is Rietveld 408576698