diff options
Diffstat (limited to 'chrome/browser/tab_restore_uitest.cc')
| -rw-r--r-- | chrome/browser/tab_restore_uitest.cc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc index facd015..0bf2dbe 100644 --- a/chrome/browser/tab_restore_uitest.cc +++ b/chrome/browser/tab_restore_uitest.cc @@ -133,11 +133,9 @@ TEST_F(TabRestoreUITest, RestoreToDifferentWindow) { // to an existing SiteInstance. (Bug 1230446) TEST_F(TabRestoreUITest, RestoreWithExistingSiteInstance) { const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); - GURL http_url1(server->TestServerPageW(L"files/title1.html")); - GURL http_url2(server->TestServerPageW(L"files/title2.html")); + TestServer server(kDocRoot); + GURL http_url1(server.TestServerPageW(L"files/title1.html")); + GURL http_url2(server.TestServerPageW(L"files/title2.html")); scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); int initial_tab_count; @@ -178,11 +176,9 @@ TEST_F(TabRestoreUITest, RestoreWithExistingSiteInstance) { // already exists. (Bug 1204135) TEST_F(TabRestoreUITest, RestoreCrossSiteWithExistingSiteInstance) { const wchar_t kDocRoot[] = L"chrome/test/data"; - scoped_refptr<HTTPTestServer> server = - HTTPTestServer::CreateServer(kDocRoot); - ASSERT_TRUE(NULL != server.get()); - GURL http_url1(server->TestServerPageW(L"files/title1.html")); - GURL http_url2(server->TestServerPageW(L"files/title2.html")); + TestServer server(kDocRoot); + GURL http_url1(server.TestServerPageW(L"files/title1.html")); + GURL http_url2(server.TestServerPageW(L"files/title2.html")); scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0)); int initial_tab_count; |