diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-29 21:44:12 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-29 21:44:12 +0000 |
| commit | 3985ba8a1d1e396d98c4dbec84077d6a67109db9 (patch) | |
| tree | aa092101b582f5a9973fc68cce625834a9436c86 /net/proxy/proxy_resolver_perftest.cc | |
| parent | 4ada238a76785ee78396cfb8e5992044c302de1e (diff) | |
| download | chromium_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/proxy/proxy_resolver_perftest.cc')
| -rw-r--r-- | net/proxy/proxy_resolver_perftest.cc | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/net/proxy/proxy_resolver_perftest.cc b/net/proxy/proxy_resolver_perftest.cc index c7f9c7a..14c4818 100644 --- a/net/proxy/proxy_resolver_perftest.cc +++ b/net/proxy/proxy_resolver_perftest.cc @@ -2,12 +2,17 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/base_paths.h" +#include "base/file_util.h" +#include "base/path_service.h" #include "base/perftimer.h" #include "base/string_util.h" #include "net/base/mock_host_resolver.h" +#include "net/base/net_errors.h" +#include "net/proxy/proxy_info.h" #include "net/proxy/proxy_resolver_js_bindings.h" #include "net/proxy/proxy_resolver_v8.h" -#include "net/url_request/url_request_unittest.h" +#include "net/test/test_server.h" #include "testing/gtest/include/gtest/gtest.h" #if defined(OS_WIN) @@ -144,7 +149,7 @@ class PacPerfSuiteRunner { void InitHttpServer() { DCHECK(!resolver_->expects_pac_bytes()); if (!server_) { - server_ = HTTPTestServer::CreateServer( + server_ = net::HTTPTestServer::CreateServer( L"net/data/proxy_resolver_perftest"); } ASSERT_TRUE(server_.get() != NULL); @@ -175,7 +180,7 @@ class PacPerfSuiteRunner { net::ProxyResolver* resolver_; std::string resolver_name_; - scoped_refptr<HTTPTestServer> server_; + scoped_refptr<net::HTTPTestServer> server_; }; #if defined(OS_WIN) |