summaryrefslogtreecommitdiffstats
path: root/net/tools
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-29 21:44:12 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-29 21:44:12 +0000
commit3985ba8a1d1e396d98c4dbec84077d6a67109db9 (patch)
treeaa092101b582f5a9973fc68cce625834a9436c86 /net/tools
parent4ada238a76785ee78396cfb8e5992044c302de1e (diff)
downloadchromium_src-3985ba8a1d1e396d98c4dbec84077d6a67109db9.zip
chromium_src-3985ba8a1d1e396d98c4dbec84077d6a67109db9.tar.gz
chromium_src-3985ba8a1d1e396d98c4dbec84077d6a67109db9.tar.bz2
GTTF: Move more test server code from net/url_request/url_request_unittest.h
to net/test/test_server.h No code changes, just a move. TEST=none BUG=49680 Review URL: http://codereview.chromium.org/3034038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54201 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
-rw-r--r--net/tools/testserver/run_testserver.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/tools/testserver/run_testserver.cc b/net/tools/testserver/run_testserver.cc
index dc16a16..edfecb7 100644
--- a/net/tools/testserver/run_testserver.cc
+++ b/net/tools/testserver/run_testserver.cc
@@ -8,7 +8,7 @@
#include "base/command_line.h"
#include "base/logging.h"
#include "base/message_loop.h"
-#include "net/url_request/url_request_unittest.h"
+#include "net/test/test_server.h"
static void PrintUsage() {
printf("run_testserver --doc-root=relpath [--http|--https|--ftp]\n");
@@ -36,10 +36,10 @@ int main(int argc, const char* argv[]) {
port = net::TestServerLauncher::kOKHTTPSPort;
} else if (command_line->HasSwitch("ftp")) {
protocol = "ftp";
- port = kFTPDefaultPort;
+ port = net::kFTPDefaultPort;
} else {
protocol = "http";
- port = kHTTPDefaultPort;
+ port = net::kHTTPDefaultPort;
}
std::wstring doc_root = command_line->GetSwitchValue("doc-root");
if (doc_root.empty()) {
@@ -49,13 +49,13 @@ int main(int argc, const char* argv[]) {
}
// Launch testserver
- scoped_refptr<BaseTestServer> test_server;
+ scoped_refptr<net::BaseTestServer> test_server;
if (protocol == "https") {
- test_server = HTTPSTestServer::CreateGoodServer(doc_root);
+ test_server = net::HTTPSTestServer::CreateGoodServer(doc_root);
} else if (protocol == "ftp") {
- test_server = FTPTestServer::CreateServer(doc_root);
+ test_server = net::FTPTestServer::CreateServer(doc_root);
} else if (protocol == "http") {
- test_server = HTTPTestServer::CreateServer(doc_root);
+ test_server = net::HTTPTestServer::CreateServer(doc_root);
} else {
NOTREACHED();
}