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

chrome/browser/tab_contents/view_source_uitest.cc

Index: chrome/browser/tab_contents/view_source_uitest.cc
diff --git a/chrome/browser/tab_contents/view_source_uitest.cc b/chrome/browser/tab_contents/view_source_uitest.cc
index 34ba3ae007ef8c828272d8499bb2398065933437..41cd428bca47e42031091f996da2c4204330aec2 100644
--- a/chrome/browser/tab_contents/view_source_uitest.cc
+++ b/chrome/browser/tab_contents/view_source_uitest.cc
@@ -7,7 +7,7 @@
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/ui/ui_test.h"
-#include "net/url_request/url_request_unittest.h"
+#include "net/test/test_server.h"
 
 namespace {
 
@@ -37,7 +37,8 @@ class ViewSourceTest : public UITest {
 // set in the html was set successfully (it shouldn't because we rendered the
 // page in view source)
 TEST_F(ViewSourceTest, DoesBrowserRenderInViewSource) {
-  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
+  scoped_refptr<net::HTTPTestServer> server(
+      net::HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
   std::string cookie = "viewsource_cookie";
   std::string cookie_data = "foo";
@@ -61,7 +62,8 @@ TEST_F(ViewSourceTest, DoesBrowserRenderInViewSource) {
 // implementation of the view-source: prefix being consumed (removed from the
 // URL) if the URL was not changed (apart from adding the view-source prefix)
 TEST_F(ViewSourceTest, DoesBrowserConsumeViewSourcePrefix) {
-  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
+  scoped_refptr<net::HTTPTestServer> server(
+      net::HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   // First we navigate to google.html.
@@ -80,7 +82,8 @@ TEST_F(ViewSourceTest, DoesBrowserConsumeViewSourcePrefix) {
 // Make sure that when looking at the actual page, we can select "View Source"
 // from the menu.
 TEST_F(ViewSourceTest, ViewSourceInMenuEnabledOnANormalPage) {
-  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
+  scoped_refptr<net::HTTPTestServer> server(
+      net::HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   GURL url(server->TestServerPage(test_html_));
@@ -92,7 +95,8 @@ TEST_F(ViewSourceTest, ViewSourceInMenuEnabledOnANormalPage) {
 // Make sure that when looking at the page source, we can't select "View Source"
 // from the menu.
 TEST_F(ViewSourceTest, ViewSourceInMenuDisabledWhileViewingSource) {
-  scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
+  scoped_refptr<net::HTTPTestServer> server(
+      net::HTTPTestServer::CreateServer(kDocRoot));
   ASSERT_TRUE(NULL != server.get());
 
   GURL url_viewsource(chrome::kViewSourceScheme + std::string(":") +