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

to net/test/test_server.h

No code changes, just a move.

TEST=none
BUG=49680

Review URL: http://codereview.chromium.org/3034038

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54201 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 13 insertions, 5 deletions

diff --git a/chrome_frame/test/http_server.cc b/chrome_frame/test/http_server.cc
index 89b0bc5..48f88e7 100644
--- a/chrome_frame/test/http_server.cc
+++ b/chrome_frame/test/http_server.cc
@@ -4,13 +4,18 @@
 
 #include "chrome_frame/test/http_server.h"
 
+#include "base/base_paths.h"
+#include "base/file_util.h"
+#include "base/path_service.h"
 #include "base/string_util.h"
+#include "base/utf_string_conversions.h"
+#include "testing/gtest/include/gtest/gtest.h"
 
 const wchar_t kDocRoot[] = L"chrome_frame\\test\\data";
 
 void ChromeFrameHTTPServer::SetUp() {
   std::wstring document_root(kDocRoot);
-  server_ = HTTPTestServer::CreateServer(document_root);
+  server_ = net::HTTPTestServer::CreateServer(document_root);
   ASSERT_TRUE(server_ != NULL);
 
   // copy CFInstance.js into the test directory
diff --git a/chrome_frame/test/http_server.h b/chrome_frame/test/http_server.h
index b902e09..30b3d19 100644
--- a/chrome_frame/test/http_server.h
+++ b/chrome_frame/test/http_server.h
@@ -10,7 +10,7 @@
 
 #include "googleurl/src/gurl.h"
 #include "base/ref_counted.h"
-#include "net/url_request/url_request_unittest.h"
+#include "net/test/test_server.h"
 
 class FilePath;
 
@@ -23,10 +23,10 @@ class ChromeFrameHTTPServer {
   GURL Resolve(const wchar_t* relative_url);
   FilePath GetDataDir();
 
-  HTTPTestServer* server() { return server_; }
+  net::HTTPTestServer* server() { return server_; }
 
  protected:
-  scoped_refptr<HTTPTestServer> server_;
+  scoped_refptr<net::HTTPTestServer> server_;
 };
 
 #endif  // CHROME_FRAME_TEST_HTTP_SERVER_H_
diff --git a/chrome_frame/test/mock_ie_event_sink_test.h b/chrome_frame/test/mock_ie_event_sink_test.h
index f2a63fd..c2ad918 100644
--- a/chrome_frame/test/mock_ie_event_sink_test.h
+++ b/chrome_frame/test/mock_ie_event_sink_test.h
@@ -9,6 +9,7 @@
 #include <atlcom.h>
 #include <string>
 
+#include "base/utf_string_conversions.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/ie_event_sink.h"
 #include "chrome_frame/test/test_server.h"
@@ -227,4 +228,4 @@ class MockIEEventSinkTest {
 
 }  // namespace chrome_frame_test
 
-#endif  // CHROME_FRAME_TEST_MOCK_IE_EVENT_SINK_TEST_H_
\ No newline at end of file
+#endif  // CHROME_FRAME_TEST_MOCK_IE_EVENT_SINK_TEST_H_
diff --git a/chrome_frame/test/test_with_web_server.cc b/chrome_frame/test/test_with_web_server.cc
index 7bd48b8..2db6172 100644
--- a/chrome_frame/test/test_with_web_server.cc
+++ b/chrome_frame/test/test_with_web_server.cc
@@ -4,7 +4,9 @@
 
 #include "chrome_frame/test/test_with_web_server.h"
 
+#include "base/base_paths.h"
 #include "base/file_version_info.h"
+#include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "base/win_util.h"
 #include "chrome/common/chrome_switches.h"