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

Unified Diff: chrome/test/in_process_browser_test.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/test/in_process_browser_test.h ('k') | chrome/test/interactive_ui/infobars_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/in_process_browser_test.cc
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc
index f2c410dc26ad0c93cfc3ff3a0f92cee21c4a2b2d..0cbb39db90a5e1cf79214aa8ae90c1d7e69c6086 100644
--- a/chrome/test/in_process_browser_test.cc
+++ b/chrome/test/in_process_browser_test.cc
@@ -36,6 +36,7 @@
#include "chrome/test/testing_browser_process.h"
#include "chrome/test/ui_test_utils.h"
#include "net/base/mock_host_resolver.h"
+#include "net/test/test_server.h"
#include "sandbox/src/dep.h"
#if defined(OS_LINUX)
@@ -238,9 +239,9 @@ void InProcessBrowserTest::TearDown() {
RenderProcessHost::set_run_renderer_in_process(original_single_process_);
}
-HTTPTestServer* InProcessBrowserTest::StartHTTPServer() {
+net::HTTPTestServer* InProcessBrowserTest::StartHTTPServer() {
DCHECK(!http_server_.get());
- http_server_ = HTTPTestServer::CreateServer(
+ http_server_ = net::HTTPTestServer::CreateServer(
L"chrome/test/data");
return http_server_.get();
}
« no previous file with comments | « chrome/test/in_process_browser_test.h ('k') | chrome/test/interactive_ui/infobars_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698