Test server cleanup patch of death:

- reduce the number of different classes
- clean up the internal code
- modify the interface to expose less internal details
  (this will allow more flexibility with port numbers)

TEST=many
BUG=49680

Review URL: http://codereview.chromium.org/3080029

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56405 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 4 deletions

diff --git a/chrome/browser/net/ftp_browsertest.cc b/chrome/browser/net/ftp_browsertest.cc
index 5033bf9..a639918 100644
--- a/chrome/browser/net/ftp_browsertest.cc
+++ b/chrome/browser/net/ftp_browsertest.cc
@@ -4,20 +4,21 @@
 
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
+#include "googleurl/src/gurl.h"
 #include "net/test/test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class FtpBrowserTest : public InProcessBrowserTest {
  public:
-  FtpBrowserTest() : server_(net::FTPTestServer::CreateServer(L"")) {
+  FtpBrowserTest() : ftp_server_(net::TestServer::TYPE_FTP, FilePath()) {
   }
 
  protected:
-  scoped_refptr<net::FTPTestServer> server_;
+  net::TestServer ftp_server_;
 };
 
 IN_PROC_BROWSER_TEST_F(FtpBrowserTest, DirectoryListing) {
-  ASSERT_TRUE(NULL != server_.get());
-  ui_test_utils::NavigateToURL(browser(), server_->TestServerPage("/"));
+  ASSERT_TRUE(ftp_server_.Start());
+  ui_test_utils::NavigateToURL(browser(), ftp_server_.GetURL("/"));
   // TODO(phajdan.jr): test more things.
 }