chrome/browser/printing/printing_layout_uitest.cc - Issue 3034038: GTTF: Move more test server code from net/url_request/url_request_unittest.h

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/printing/printing_layout_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/browser/printing/print_dialog_cloud_uitest.cc ('k') | chrome/browser/renderer_host/resource_dispatcher_host_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/printing/printing_layout_uitest.cc

diff --git a/chrome/browser/printing/printing_layout_uitest.cc b/chrome/browser/printing/printing_layout_uitest.cc

index f559c33f784668fb0c61e4bc93abd3c786cab2ef..db20963742e68ac98bd6b7f0cfc88c613ca357a7 100644

--- a/chrome/browser/printing/printing_layout_uitest.cc

+++ b/chrome/browser/printing/printing_layout_uitest.cc

@@ -13,7 +13,7 @@

#include "chrome/test/automation/window_proxy.h"

#include "chrome/test/ui/ui_test.h"

#include "gfx/gdi_util.h"

-#include "net/url_request/url_request_unittest.h"

+#include "net/test/test_server.h"

#include "printing/image.h"

#include "printing/printing_test.h"

#include "printing/native_metafile.h"

@@ -292,7 +292,8 @@ TEST_F(PrintingLayoutTextTest, FAILS_Complex) {

"close_printdlg_thread");

// Print a document, check its output.

- scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));

+ scoped_refptr<net::HTTPTestServer> server(

+ net::HTTPTestServer::CreateServer(kDocRoot));

ASSERT_TRUE(NULL != server.get());

NavigateToURL(server->TestServerPage("files/printing/test1.html"));

@@ -323,7 +324,8 @@ TEST_F(PrintingLayoutTestHidden, DISABLED_ManyTimes) {

if (IsTestCaseDisabled())

return;

- scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));

+ scoped_refptr<net::HTTPTestServer> server(

+ net::HTTPTestServer::CreateServer(kDocRoot));

ASSERT_TRUE(NULL != server.get());

DismissTheWindow dismisser(base::GetProcId(process()));

@@ -373,7 +375,8 @@ TEST_F(PrintingLayoutTest, DISABLED_Delayed) {

if (IsTestCaseDisabled())

return;

- scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));

+ scoped_refptr<net::HTTPTestServer> server(

+ net::HTTPTestServer::CreateServer(kDocRoot));

ASSERT_TRUE(NULL != server.get());

{

@@ -407,7 +410,8 @@ TEST_F(PrintingLayoutTest, DISABLED_IFrame) {

if (IsTestCaseDisabled())

return;

- scoped_refptr<HTTPTestServer> server(HTTPTestServer::CreateServer(kDocRoot));

+ scoped_refptr<net::HTTPTestServer> server(

+ net::HTTPTestServer::CreateServer(kDocRoot));

ASSERT_TRUE(NULL != server.get());

{