summaryrefslogtreecommitdiffstats
path: root/sync/internal_api/http_bridge_unittest.cc
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 /sync/internal_api/http_bridge_unittest.cc
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 'sync/internal_api/http_bridge_unittest.cc')
-rw-r--r--sync/internal_api/http_bridge_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/sync/internal_api/http_bridge_unittest.cc b/sync/internal_api/http_bridge_unittest.cc
index 93df2b7..ad50367 100644
--- a/sync/internal_api/http_bridge_unittest.cc
+++ b/sync/internal_api/http_bridge_unittest.cc
@@ -5,7 +5,7 @@
#include "base/message_loop_proxy.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/thread.h"
-#include "net/test/test_server.h"
+#include "net/test/spawned_test_server.h"
#include "net/url_request/test_url_fetcher_factory.h"
#include "net/url_request/url_fetcher_delegate.h"
#include "net/url_request/url_request_test_util.h"
@@ -23,8 +23,8 @@ const base::FilePath::CharType kDocRoot[] =
class SyncHttpBridgeTest : public testing::Test {
public:
SyncHttpBridgeTest()
- : test_server_(net::TestServer::TYPE_HTTP,
- net::TestServer::kLocalhost,
+ : test_server_(net::SpawnedTestServer::TYPE_HTTP,
+ net::SpawnedTestServer::kLocalhost,
base::FilePath(kDocRoot)),
fake_default_request_context_getter_(NULL),
bridge_for_race_test_(NULL),
@@ -92,7 +92,7 @@ class SyncHttpBridgeTest : public testing::Test {
return fake_default_request_context_getter_;
}
- net::TestServer test_server_;
+ net::SpawnedTestServer test_server_;
base::Thread* io_thread() { return &io_thread_; }