| Index: chrome/browser/tab_restore_uitest.cc
|
| diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc
|
| index ac655ea71d5cea8bda7ae5e052794f3f748ff247..009d780df7d0acb3442f9cb5bfe4dc4d045d7a42 100644
|
| --- a/chrome/browser/tab_restore_uitest.cc
|
| +++ b/chrome/browser/tab_restore_uitest.cc
|
| @@ -459,8 +459,7 @@ TEST_F(TabRestoreUITest, FLAKY_RestoreIntoSameWindow) {
|
| // 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, NULL);
|
| + scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
|
| ASSERT_TRUE(NULL != server.get());
|
| GURL http_url1(server->TestServerPage("files/title1.html"));
|
| GURL http_url2(server->TestServerPage("files/title2.html"));
|
| @@ -506,8 +505,7 @@ 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, NULL);
|
| + scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
|
| ASSERT_TRUE(NULL != server.get());
|
| GURL http_url1(server->TestServerPage("files/title1.html"));
|
| GURL http_url2(server->TestServerPage("files/title2.html"));
|
| @@ -648,8 +646,7 @@ TEST_F(TabRestoreUITest, RestoreTabWithSpecialURL) {
|
| // entry and see that it loads properly. See http://crbug.com/31905
|
| TEST_F(TabRestoreUITest, RestoreTabWithSpecialURLOnBack) {
|
| const wchar_t kDocRoot[] = L"chrome/test/data";
|
| - scoped_refptr<HTTPTestServer> server =
|
| - HTTPTestServer::CreateServer(kDocRoot, NULL);
|
| + scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
|
| ASSERT_TRUE(server.get());
|
| const GURL http_url(server->TestServerPage("files/title1.html"));
|
|
|
|
|