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 /chrome_frame/test/http_server.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 'chrome_frame/test/http_server.cc')
| -rw-r--r-- | chrome_frame/test/http_server.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome_frame/test/http_server.cc b/chrome_frame/test/http_server.cc index 89b0bc5..48f88e7 100644 --- a/chrome_frame/test/http_server.cc +++ b/chrome_frame/test/http_server.cc @@ -4,13 +4,18 @@ #include "chrome_frame/test/http_server.h" +#include "base/base_paths.h" +#include "base/file_util.h" +#include "base/path_service.h" #include "base/string_util.h" +#include "base/utf_string_conversions.h" +#include "testing/gtest/include/gtest/gtest.h" const wchar_t kDocRoot[] = L"chrome_frame\\test\\data"; void ChromeFrameHTTPServer::SetUp() { std::wstring document_root(kDocRoot); - server_ = HTTPTestServer::CreateServer(document_root); + server_ = net::HTTPTestServer::CreateServer(document_root); ASSERT_TRUE(server_ != NULL); // copy CFInstance.js into the test directory |