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, 5 deletions

diff --git a/chrome/test/in_process_browser_test.h b/chrome/test/in_process_browser_test.h
index eef6c94..0af1877 100644
--- a/chrome/test/in_process_browser_test.h
+++ b/chrome/test/in_process_browser_test.h
@@ -9,6 +9,7 @@
 #include "base/compiler_specific.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
+#include "net/test/test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class Browser;
@@ -16,7 +17,6 @@ class CommandLine;
 class Profile;
 
 namespace net {
-class HTTPTestServer;
 class RuleBasedHostResolverProc;
 }
 
@@ -101,8 +101,8 @@ class InProcessBrowserTest : public testing::Test {
   // Sets Initial Timeout value.
   void SetInitialTimeoutInMS(int initial_timeout);
 
-  // Starts an HTTP server.
-  net::HTTPTestServer* StartHTTPServer() WARN_UNUSED_RESULT;
+  // Returns the testing server. Guaranteed to be non-NULL.
+  net::TestServer* test_server() { return &test_server_; }
 
   // Creates a browser with a single tab (about:blank), waits for the tab to
   // finish loading and shows the browser.
@@ -136,8 +136,8 @@ class InProcessBrowserTest : public testing::Test {
   // Browser created from CreateBrowser.
   Browser* browser_;
 
-  // HTTPServer, created when StartHTTPServer is invoked.
-  scoped_refptr<net::HTTPTestServer> http_server_;
+  // Testing server, started on demand.
+  net::TestServer test_server_;
 
   // Whether this test requires the browser windows to be shown (interactive
   // tests for example need the windows shown).