| 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..7c09b95000eb34dba5ba3346ea7598739040a915 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),
|
| + override_selected_web_ui_(NULL) {}
|
|
|
| namespace {
|
|
|
| @@ -254,6 +255,10 @@ void WebUIBrowserTest::TearDownInProcessBrowserTestFixture() {
|
| TestChromeWebUIFactory::RemoveFactoryOverride(GURL(kDummyURL).host());
|
| }
|
|
|
| +void WebUIBrowserTest::SetWebUIInstance(WebUI* web_ui) {
|
| + override_selected_web_ui_ = web_ui;
|
| +}
|
| +
|
| WebUIMessageHandler* WebUIBrowserTest::GetMockMessageHandler() {
|
| return NULL;
|
| }
|
| @@ -363,7 +368,8 @@ bool WebUIBrowserTest::RunJavascriptUsingHandler(
|
| }
|
|
|
| void WebUIBrowserTest::SetupHandlers() {
|
| - WebUI* web_ui_instance =
|
| + WebUI* web_ui_instance = override_selected_web_ui_ ?
|
| + override_selected_web_ui_ :
|
| browser()->GetSelectedTabContents()->web_ui();
|
| ASSERT_TRUE(web_ui_instance != NULL);
|
| web_ui_instance->set_register_callback_overwrites(true);
|
|
|