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 /chrome/browser/extensions/extension_apitest.cc | |
| 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 'chrome/browser/extensions/extension_apitest.cc')
| -rw-r--r-- | chrome/browser/extensions/extension_apitest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_apitest.cc b/chrome/browser/extensions/extension_apitest.cc index 8d072ae..bb2279c 100644 --- a/chrome/browser/extensions/extension_apitest.cc +++ b/chrome/browser/extensions/extension_apitest.cc @@ -19,7 +19,7 @@ #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "net/base/net_util.h" -#include "net/test/test_server.h" +#include "net/test/spawned_test_server.h" namespace { @@ -301,9 +301,9 @@ bool ExtensionApiTest::StartTestServer() { bool ExtensionApiTest::StartWebSocketServer( const base::FilePath& root_directory) { - websocket_server_.reset(new net::TestServer( - net::TestServer::TYPE_WS, - net::TestServer::kLocalhost, + websocket_server_.reset(new net::SpawnedTestServer( + net::SpawnedTestServer::TYPE_WS, + net::SpawnedTestServer::kLocalhost, root_directory)); if (!websocket_server_->Start()) |