| Index: chrome/browser/tab_restore_uitest.cc
|
| ===================================================================
|
| --- chrome/browser/tab_restore_uitest.cc (revision 7499)
|
| +++ chrome/browser/tab_restore_uitest.cc (working copy)
|
| @@ -133,9 +133,11 @@
|
| // to an existing SiteInstance. (Bug 1230446)
|
| TEST_F(TabRestoreUITest, RestoreWithExistingSiteInstance) {
|
| const wchar_t kDocRoot[] = L"chrome/test/data";
|
| - TestServer server(kDocRoot);
|
| - GURL http_url1(server.TestServerPageW(L"files/title1.html"));
|
| - GURL http_url2(server.TestServerPageW(L"files/title2.html"));
|
| + 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"));
|
|
|
| scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
|
| int initial_tab_count;
|
| @@ -176,9 +178,11 @@
|
| // already exists. (Bug 1204135)
|
| TEST_F(TabRestoreUITest, RestoreCrossSiteWithExistingSiteInstance) {
|
| const wchar_t kDocRoot[] = L"chrome/test/data";
|
| - TestServer server(kDocRoot);
|
| - GURL http_url1(server.TestServerPageW(L"files/title1.html"));
|
| - GURL http_url2(server.TestServerPageW(L"files/title2.html"));
|
| + 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"));
|
|
|
| scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
|
| int initial_tab_count;
|
|
|