diff options
| author | erikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-08 20:45:27 +0000 |
|---|---|---|
| committer | erikkay@google.com <erikkay@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-08 20:45:27 +0000 |
| commit | dd26501ef315e241911a31a8a98027c9bbb65560 (patch) | |
| tree | 1c02dfce0035199f0c073ebf793607d6e7934be5 /chrome/browser/tab_restore_uitest.cc | |
| parent | 7ecec17feb965bab7cd348ab16a9da8d772f70dc (diff) | |
| download | chromium_src-dd26501ef315e241911a31a8a98027c9bbb65560.zip chromium_src-dd26501ef315e241911a31a8a98027c9bbb65560.tar.gz chromium_src-dd26501ef315e241911a31a8a98027c9bbb65560.tar.bz2 | |
Add FTP unit test in preparation for portable FTP implementation.
Clean up test server code.
Originally from issue 12939, written by Ibrar Ahmed (ibrar.ahmed@gmail.com)
(take 2)
Review URL: http://codereview.chromium.org/17040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7755 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_restore_uitest.cc')
| -rw-r--r-- | chrome/browser/tab_restore_uitest.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc index 0bf2dbe..facd015 100644 --- a/chrome/browser/tab_restore_uitest.cc +++ b/chrome/browser/tab_restore_uitest.cc @@ -133,9 +133,11 @@ TEST_F(TabRestoreUITest, RestoreToDifferentWindow) { // 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 @@ TEST_F(TabRestoreUITest, RestoreWithExistingSiteInstance) { // 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; |