summaryrefslogtreecommitdiffstats
path: root/net/test
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-03 18:57:22 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-03 18:57:22 +0000
commitce7d0cbc07beeac9515f0343c6d56e77ee83879a (patch)
treee7fa63e776a5fa9873e735a0b1b31b7c19249945 /net/test
parent47914ce872d5e3c1901eeeb44c02dd197c01992d (diff)
downloadchromium_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 'net/test')
-rw-r--r--net/test/spawned_test_server.h (renamed from net/test/test_server.h)10
-rw-r--r--net/test/spawner_communicator.h4
2 files changed, 7 insertions, 7 deletions
diff --git a/net/test/test_server.h b/net/test/spawned_test_server.h
index d005d8c..f673869 100644
--- a/net/test/test_server.h
+++ b/net/test/spawned_test_server.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef NET_TEST_TEST_SERVER_H_
-#define NET_TEST_TEST_SERVER_H_
+#ifndef NET_TEST_SPAWNED_TEST_SERVER_H_
+#define NET_TEST_SPAWNED_TEST_SERVER_H_
#include "build/build_config.h"
@@ -16,12 +16,12 @@
namespace net {
#if defined(OS_ANDROID)
-typedef RemoteTestServer TestServer;
+typedef RemoteTestServer SpawnedTestServer;
#else
-typedef LocalTestServer TestServer;
+typedef LocalTestServer SpawnedTestServer;
#endif
} // namespace net
-#endif // NET_TEST_TEST_SERVER_H_
+#endif // NET_TEST_SPAWNED_TEST_SERVER_H_
diff --git a/net/test/spawner_communicator.h b/net/test/spawner_communicator.h
index 4b4fbaf..6280a48 100644
--- a/net/test/spawner_communicator.h
+++ b/net/test/spawner_communicator.h
@@ -29,8 +29,8 @@ class ScopedPortException;
// themselves continue running on the device. To control the test server on the
// host machine, a second HTTP server is started, the spawner server, which
// controls the life cycle of remote test servers. Calls to start/kill the
-// net::TestServer are then redirected to the spawner server via this spawner
-// communicator.
+// net::SpawnedTestServer are then redirected to the spawner server via
+// this spawner communicator.
//
// Currently only three commands are supported by spawner.
//