GTTF: Move more test server code from net/url_request/url_request_unittest.h

chrome/browser/history/redirect_uitest.cc

Index: chrome/browser/history/redirect_uitest.cc
diff --git a/chrome/browser/history/redirect_uitest.cc b/chrome/browser/history/redirect_uitest.cc
index 4c3fe38b7ef9933ef779eab9596a368902a14f8a..67b9a622a3434d668114740fe5dc03f0d36115a2 100644
--- a/chrome/browser/history/redirect_uitest.cc
+++ b/chrome/browser/history/redirect_uitest.cc
@@ -15,7 +15,7 @@
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/net_util.h"
-#include "net/url_request/url_request_unittest.h"
+#include "net/test/test_server.h"
 
 namespace {
 
@@ -25,7 +25,8 @@ typedef UITest RedirectTest;
 
 // Tests a single server redirect
 TEST_F(RedirectTest, Server) {
-  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
+  scoped_refptr<net::HTTPTestServer> server(
+      net::HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   GURL final_url = server->TestServerPage(std::string());
@@ -46,7 +47,8 @@ TEST_F(RedirectTest, Server) {
 
 // Tests a single client redirect.
 TEST_F(RedirectTest, Client) {
-  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
+  scoped_refptr<net::HTTPTestServer> server(
+      net::HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   GURL final_url = server->TestServerPage(std::string());
@@ -79,7 +81,8 @@ TEST_F(RedirectTest, Client) {
 }
 
 TEST_F(RedirectTest, ClientEmptyReferer) {
-  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
+  scoped_refptr<net::HTTPTestServer> server(
+      net::HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   GURL final_url = server->TestServerPage(std::string());
@@ -138,7 +141,8 @@ TEST_F(RedirectTest, ClientCancelled) {
 
 // Tests a client->server->server redirect
 TEST_F(RedirectTest, ClientServerServer) {
-  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
+  scoped_refptr<net::HTTPTestServer> server(
+      net::HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   GURL final_url = server->TestServerPage(std::string());
@@ -171,7 +175,8 @@ TEST_F(RedirectTest, ClientServerServer) {
 
 // Tests that the "#reference" gets preserved across server redirects.
 TEST_F(RedirectTest, ServerReference) {
-  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
+  scoped_refptr<net::HTTPTestServer> server(
+      net::HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   const std::string ref("reference");
@@ -190,7 +195,8 @@ TEST_F(RedirectTest, ServerReference) {
 // A) does not crash the browser or confuse the redirect chain, see bug 1080873
 // B) does not take place.
 TEST_F(RedirectTest, NoHttpToFile) {
-  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
+  scoped_refptr<net::HTTPTestServer> server(
+      net::HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
   FilePath test_file(test_data_directory_);
   test_file = test_file.AppendASCII("http_to_file.html");
@@ -212,7 +218,8 @@ TEST_F(RedirectTest, NoHttpToFile) {
 // Ensures that non-user initiated location changes (within page) are
 // flagged as client redirects. See bug 1139823.
 TEST_F(RedirectTest, ClientFragments) {
-  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
+  scoped_refptr<net::HTTPTestServer> server(
+      net::HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   FilePath test_file(test_data_directory_);
@@ -245,7 +252,8 @@ TEST_F(RedirectTest,
   // which causes it to start a provisional load, and while it is waiting
   // for the response (which means it hasn't committed the load for the client
   // redirect destination page yet), we issue a new navigation request.
-  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
+  scoped_refptr<net::HTTPTestServer> server(
+      net::HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   GURL final_url = server->TestServerPage("files/title2.html");