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

Unified Diff: chrome/worker/worker_uitest.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/ui/ppapi_uitest.cc ('k') | chrome_frame/test/http_server.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/worker/worker_uitest.cc
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 8453a1aa386b6ba2ce92cba1c3f74784952c1c46..f054be40ca59a8bf4b68d218ebdeaecd190fc849 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -12,7 +12,7 @@
#include "chrome/test/automation/tab_proxy.h"
#include "chrome/test/ui/ui_layout_test.h"
#include "chrome/test/ui_test_utils.h"
-#include "net/url_request/url_request_unittest.h"
+#include "net/test/test_server.h"
namespace {
@@ -198,7 +198,8 @@ const wchar_t kDocRoot[] = L"chrome/test/data/workers";
#endif
// Make sure that auth dialog is displayed from worker context.
TEST_F(WorkerTest, WorkerHttpAuth) {
- scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
+ scoped_refptr<net::HTTPTestServer> server(
+ net::HTTPTestServer::CreateServer(kDocRoot));
ASSERT_TRUE(NULL != server.get());
scoped_refptr<TabProxy> tab(GetActiveTab());
@@ -215,7 +216,8 @@ TEST_F(WorkerTest, WorkerHttpAuth) {
#endif
// Make sure that auth dialog is displayed from shared worker context.
TEST_F(WorkerTest, SharedWorkerHttpAuth) {
- scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));
+ scoped_refptr<net::HTTPTestServer> server(
+ net::HTTPTestServer::CreateServer(kDocRoot));
ASSERT_TRUE(NULL != server.get());
scoped_refptr<TabProxy> tab(GetActiveTab());
« no previous file with comments | « chrome/test/ui/ppapi_uitest.cc ('k') | chrome_frame/test/http_server.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698