diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-03 18:57:22 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-03 18:57:22 +0000 |
| commit | ce7d0cbc07beeac9515f0343c6d56e77ee83879a (patch) | |
| tree | e7fa63e776a5fa9873e735a0b1b31b7c19249945 /sync/test | |
| parent | 47914ce872d5e3c1901eeeb44c02dd197c01992d (diff) | |
| download | chromium_src-ce7d0cbc07beeac9515f0343c6d56e77ee83879a.zip chromium_src-ce7d0cbc07beeac9515f0343c6d56e77ee83879a.tar.gz chromium_src-ce7d0cbc07beeac9515f0343c6d56e77ee83879a.tar.bz2 | |
GTTF: rename net::TestServer -> net::SpawnedTestServer
This is a part of replacing most usages of the Python test server
with an in-process C++ test server that should be easier to debug.
BUG=96594
R=rch@chromium.org
Review URL: https://codereview.chromium.org/14702004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198151 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/test')
| -rw-r--r-- | sync/test/local_sync_test_server.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sync/test/local_sync_test_server.cc b/sync/test/local_sync_test_server.cc index a11234f..4f9242b 100644 --- a/sync/test/local_sync_test_server.cc +++ b/sync/test/local_sync_test_server.cc @@ -9,20 +9,22 @@ #include "base/string_number_conversions.h" #include "base/values.h" #include "net/test/python_utils.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" namespace syncer { LocalSyncTestServer::LocalSyncTestServer() - : LocalTestServer(net::TestServer::TYPE_HTTP, // Sync uses the HTTP scheme. - net::TestServer::kLocalhost, - base::FilePath()), + : LocalTestServer( + net::SpawnedTestServer::TYPE_HTTP, // Sync uses the HTTP scheme. + net::SpawnedTestServer::kLocalhost, + base::FilePath()), xmpp_port_(0) {} LocalSyncTestServer::LocalSyncTestServer(uint16 port, uint16 xmpp_port) - : LocalTestServer(net::TestServer::TYPE_HTTP, // Sync uses the HTTP scheme. - net::TestServer::kLocalhost, - base::FilePath()), + : LocalTestServer( + net::SpawnedTestServer::TYPE_HTTP, // Sync uses the HTTP scheme. + net::SpawnedTestServer::kLocalhost, + base::FilePath()), xmpp_port_(xmpp_port) { SetPort(port); } |