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

chrome/browser/tab_restore_uitest.cc

Index: chrome/browser/tab_restore_uitest.cc
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc
index 009d780df7d0acb3442f9cb5bfe4dc4d045d7a42..dd1bc29ad903e50c65d55b3cda2319a26da8b560 100644
--- a/chrome/browser/tab_restore_uitest.cc
+++ b/chrome/browser/tab_restore_uitest.cc
@@ -19,7 +19,7 @@
 #include "chrome/test/ui/ui_test.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
-#include "net/url_request/url_request_unittest.h"
+#include "net/test/test_server.h"
 
 // http://code.google.com/p/chromium/issues/detail?id=14774
 #if (defined(OS_WIN) || defined(OS_CHROMEOS)) && !defined(NDEBUG)
@@ -459,7 +459,8 @@ TEST_F(TabRestoreUITest, FLAKY_RestoreIntoSameWindow) {
 // to an existing SiteInstance.  (Bug 1230446)
 TEST_F(TabRestoreUITest, RestoreWithExistingSiteInstance) {
   const wchar_t kDocRoot[] = L"chrome/test/data";
-  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
+  scoped_refptr<net::HTTPTestServer> server(
+      net::HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
   GURL http_url1(server->TestServerPage("files/title1.html"));
   GURL http_url2(server->TestServerPage("files/title2.html"));
@@ -505,7 +506,8 @@ TEST_F(TabRestoreUITest, RestoreWithExistingSiteInstance) {
 // already exists.  (Bug 1204135)
 TEST_F(TabRestoreUITest, RestoreCrossSiteWithExistingSiteInstance) {
   const wchar_t kDocRoot[] = L"chrome/test/data";
-  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
+  scoped_refptr<net::HTTPTestServer> server(
+      net::HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
   GURL http_url1(server->TestServerPage("files/title1.html"));
   GURL http_url2(server->TestServerPage("files/title2.html"));
@@ -646,7 +648,8 @@ TEST_F(TabRestoreUITest, RestoreTabWithSpecialURL) {
 // entry and see that it loads properly. See http://crbug.com/31905
 TEST_F(TabRestoreUITest, RestoreTabWithSpecialURLOnBack) {
   const wchar_t kDocRoot[] = L"chrome/test/data";
-  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
+  scoped_refptr<net::HTTPTestServer> server(
+      net::HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(server.get());
   const GURL http_url(server->TestServerPage("files/title1.html"));