diff options
Diffstat (limited to 'chrome/test/interactive_ui')
| -rw-r--r-- | chrome/test/interactive_ui/infobars_uitest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/test/interactive_ui/infobars_uitest.cc b/chrome/test/interactive_ui/infobars_uitest.cc index a57ef58..34d1bda 100644 --- a/chrome/test/interactive_ui/infobars_uitest.cc +++ b/chrome/test/interactive_ui/infobars_uitest.cc @@ -16,17 +16,17 @@ class InfoBarsUITest : public UITest { }; TEST_F(InfoBarsUITest, TestInfoBarsCloseOnNewTheme) { - const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<net::HTTPTestServer> server( - net::HTTPTestServer::CreateServer(kDocRoot)); - ASSERT_TRUE(server.get() != NULL); + net::TestServer test_server(net::TestServer::TYPE_HTTP, + FilePath(FILE_PATH_LITERAL("chrome/test/data"))); + ASSERT_TRUE(test_server.Start()); + scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0)); ASSERT_TRUE(browser.get()); scoped_refptr<TabProxy> tab_1(browser->GetActiveTab()); ASSERT_TRUE(tab_1.get()); EXPECT_TRUE(tab_1->NavigateToURL( - server->TestServerPage("files/simple.html"))); + test_server.GetURL("files/simple.html"))); scoped_refptr<ExtensionProxy> theme = automation()->InstallExtension( test_data_directory_.AppendASCII("extensions").AppendASCII("theme.crx"), true); @@ -34,7 +34,7 @@ TEST_F(InfoBarsUITest, TestInfoBarsCloseOnNewTheme) { EXPECT_TRUE(tab_1->WaitForInfoBarCount(1, action_max_timeout_ms())); EXPECT_TRUE(browser->AppendTab( - server->TestServerPage("files/simple.html"))); + test_server.GetURL("files/simple.html"))); WaitUntilTabCount(2); scoped_refptr<TabProxy> tab_2(browser->GetActiveTab()); ASSERT_TRUE(tab_2.get()); |