| 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..d960cc1ba8ef7f218bb1708b4e311b4f2e1731d6 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(
|
| @@ -223,6 +210,16 @@ WebUIBrowserTest::WebUIBrowserTest()
|
| libraries_preloaded_(false),
|
| override_selected_web_ui_(NULL) {}
|
|
|
| +void WebUIBrowserTest::set_preload_test_fixture(
|
| + const std::string& preload_test_fixture) {
|
| + preload_test_fixture_ = preload_test_fixture;
|
| +}
|
| +
|
| +void WebUIBrowserTest::set_preload_test_name(
|
| + const std::string& preload_test_name) {
|
| + preload_test_name_ = preload_test_name;
|
| +}
|
| +
|
| namespace {
|
|
|
| class MockWebUIProvider : public TestChromeWebUIFactory::WebUIProvider {
|
|
|