summaryrefslogtreecommitdiffstats
path: root/chrome_frame/test/http_server.h
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-29 21:44:12 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-29 21:44:12 +0000
commit3985ba8a1d1e396d98c4dbec84077d6a67109db9 (patch)
treeaa092101b582f5a9973fc68cce625834a9436c86 /chrome_frame/test/http_server.h
parent4ada238a76785ee78396cfb8e5992044c302de1e (diff)
downloadchromium_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.h')
-rw-r--r--chrome_frame/test/http_server.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome_frame/test/http_server.h b/chrome_frame/test/http_server.h
index b902e09..30b3d19 100644
--- a/chrome_frame/test/http_server.h
+++ b/chrome_frame/test/http_server.h
@@ -10,7 +10,7 @@
#include "googleurl/src/gurl.h"
#include "base/ref_counted.h"
-#include "net/url_request/url_request_unittest.h"
+#include "net/test/test_server.h"
class FilePath;
@@ -23,10 +23,10 @@ class ChromeFrameHTTPServer {
GURL Resolve(const wchar_t* relative_url);
FilePath GetDataDir();
- HTTPTestServer* server() { return server_; }
+ net::HTTPTestServer* server() { return server_; }
protected:
- scoped_refptr<HTTPTestServer> server_;
+ scoped_refptr<net::HTTPTestServer> server_;
};
#endif // CHROME_FRAME_TEST_HTTP_SERVER_H_