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, 1 insertions, 7 deletions

diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index dead3d2..16ba8b3 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -85,11 +85,7 @@ void ChromeFrameTestWithWebServer::SetUp() {
       .Append(FILE_PATH_LITERAL("data"));
 
   server_.SetUp();
-  EXPECT_TRUE(server_.server() != NULL);
-  if (server_.server()) {
-    results_dir_ = server_.GetDataDir();
-    results_dir_ = results_dir_.AppendASCII("dump");
-  }
+  results_dir_ = server_.test_server()->document_root().AppendASCII("dump");
 }
 
 void ChromeFrameTestWithWebServer::TearDown() {
@@ -100,7 +96,6 @@ void ChromeFrameTestWithWebServer::TearDown() {
 
 bool ChromeFrameTestWithWebServer::LaunchBrowser(BrowserKind browser,
                                                  const wchar_t* page) {
-  EXPECT_TRUE(server_.server() != NULL);
   std::wstring url = page;
   if (url.find(L"files/") != std::wstring::npos)
     url = UTF8ToWide(server_.Resolve(page).spec());
@@ -163,7 +158,6 @@ bool ChromeFrameTestWithWebServer::BringBrowserToTop() {
 }
 
 bool ChromeFrameTestWithWebServer::WaitForTestToComplete(int milliseconds) {
-  EXPECT_TRUE(server_.server() != NULL);
   return server_.WaitToFinish(milliseconds);
 }