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, 2 insertions, 10 deletions

diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc
index 4761c0a..9fc2544 100644
--- a/chrome/test/in_process_browser_test.cc
+++ b/chrome/test/in_process_browser_test.cc
@@ -78,6 +78,8 @@ const int kSubsequentTimeoutInMS = 5000;
 
 InProcessBrowserTest::InProcessBrowserTest()
     : browser_(NULL),
+      test_server_(net::TestServer::TYPE_HTTP,
+                   FilePath(FILE_PATH_LITERAL("chrome/test/data"))),
       show_window_(false),
       dom_automation_enabled_(false),
       tab_closeable_state_watcher_enabled_(false),
@@ -237,13 +239,6 @@ void InProcessBrowserTest::TearDown() {
   RenderProcessHost::set_run_renderer_in_process(original_single_process_);
 }
 
-net::HTTPTestServer* InProcessBrowserTest::StartHTTPServer() {
-  DCHECK(!http_server_.get());
-  http_server_ = net::HTTPTestServer::CreateServer(
-      L"chrome/test/data");
-  return http_server_.get();
-}
-
 // Creates a browser with a single tab (about:blank), waits for the tab to
 // finish loading and shows the browser.
 Browser* InProcessBrowserTest::CreateBrowser(Profile* profile) {
@@ -312,9 +307,6 @@ void InProcessBrowserTest::RunTestOnMainThreadLoop() {
 
   QuitBrowsers();
   pool.Recycle();
-
-  // Stop the HTTP server.
-  http_server_ = NULL;
 }
 
 void InProcessBrowserTest::QuitBrowsers() {