Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7729)

Unified Diff: chrome_frame/test/http_server.cc

Issue 3034038: GTTF: Move more test server code from net/url_request/url_request_unittest.h (Closed)
Patch Set: hopefully final Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/test/http_server.h ('k') | chrome_frame/test/mock_ie_event_sink_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/http_server.cc
diff --git a/chrome_frame/test/http_server.cc b/chrome_frame/test/http_server.cc
index 89b0bc51b4f9e4a44a183ffbf8d5c90847b11254..48f88e758709e896c4f2368fb969d090ced0fa7b 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
« no previous file with comments | « chrome_frame/test/http_server.h ('k') | chrome_frame/test/mock_ie_event_sink_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698