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

chrome/browser/history/multipart_uitest.cc

Index: chrome/browser/history/multipart_uitest.cc
diff --git a/chrome/browser/history/multipart_uitest.cc b/chrome/browser/history/multipart_uitest.cc
index f05b0a77494b4bf6b762eb4f41cdd15537fbd0ef..aabf59351f2f49d98268d5080ea6077f03b8a02b 100644
--- a/chrome/browser/history/multipart_uitest.cc
+++ b/chrome/browser/history/multipart_uitest.cc
@@ -6,9 +6,10 @@
 
 #include "app/sql/connection.h"
 #include "app/sql/statement.h"
+#include "base/file_util.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
-#include "net/url_request/url_request_unittest.h"
+#include "net/test/test_server.h"
 
 namespace {
 
@@ -30,8 +31,8 @@ TEST_F(MultipartResponseUITest, MAYBE_SingleVisit) {
   // Make sure that visiting a multipart/x-mixed-replace site only
   // creates one entry in the visits table.
   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());
 
   scoped_refptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));