summaryrefslogtreecommitdiffstats
path: root/webkit/glue/unittest_test_server.h
diff options
context:
space:
mode:
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() {
}