summaryrefslogtreecommitdiffstats
path: root/webkit/glue/unittest_test_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 /webkit/glue/unittest_test_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 'webkit/glue/unittest_test_server.h')
-rw-r--r--webkit/glue/unittest_test_server.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/webkit/glue/unittest_test_server.h b/webkit/glue/unittest_test_server.h
index 0b3c7d2..fe282ec 100644
--- a/webkit/glue/unittest_test_server.h
+++ b/webkit/glue/unittest_test_server.h
@@ -5,17 +5,18 @@
#ifndef WEBKIT_GLUE_UNITTEST_TEST_SERVER_H__
#define WEBKIT_GLUE_UNITTEST_TEST_SERVER_H__
+#include "net/base/load_flags.h"
+#include "net/test/test_server.h"
+#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/appcache/appcache_interfaces.h"
#include "webkit/glue/resource_loader_bridge.h"
-#include "net/base/load_flags.h"
-#include "net/url_request/url_request_unittest.h"
using webkit_glue::ResourceLoaderBridge;
// We need to use ResourceLoaderBridge to communicate with the testserver
// instead of using URLRequest directly because URLRequests need to be run on
// the test_shell's IO thread.
-class UnittestTestServer : public HTTPTestServer {
+class UnittestTestServer : public net::HTTPTestServer {
protected:
UnittestTestServer() {
}