chrome/browser/devtools/device/port_forwarding_browsertest.cc - Issue 1409163006: Migrating tests to use EmbeddedTestServer (/chrome/browser misc)

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/devtools/device/port_forwarding_browsertest.cc

Issue 1409163006: Migrating tests to use EmbeddedTestServer (/chrome/browser misc) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. Created 5 years, 1 month 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/custom_handlers/protocol_handler_registry_browsertest.cc ('k') | chrome/browser/devtools/devtools_sanity_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/devtools/device/port_forwarding_browsertest.cc

diff --git a/chrome/browser/devtools/device/port_forwarding_browsertest.cc b/chrome/browser/devtools/device/port_forwarding_browsertest.cc

index 006e0b7a2e08b1ccc9aae21c880c4652ce0fa677..3ad185b89c07a8ed08fbfce5e36c78aaebf606f3 100644

--- a/chrome/browser/devtools/device/port_forwarding_browsertest.cc

+++ b/chrome/browser/devtools/device/port_forwarding_browsertest.cc

@@ -23,10 +23,10 @@

#include "content/public/common/content_switches.h"

#include "content/public/test/browser_test_utils.h"

#include "content/public/test/test_utils.h"

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

namespace {

-const char kPortForwardingTestPage[] =

- "files/devtools/port_forwarding/main.html";

+const char kPortForwardingTestPage[] = "/devtools/port_forwarding/main.html";

const int kDefaultDebuggingPort = 9223;

const int kAlternativeDebuggingPort = 9224;

@@ -88,8 +88,8 @@ IN_PROC_BROWSER_TEST_F(PortForwardingTest,

DevToolsAndroidBridge::Factory::GetForProfile(profile)->

set_device_providers_for_test(device_providers);

- ASSERT_TRUE(test_server()->Start());

- GURL original_url = test_server()->GetURL(kPortForwardingTestPage);

+ ASSERT_TRUE(embedded_test_server()->Start());

+ GURL original_url = embedded_test_server()->GetURL(kPortForwardingTestPage);

std::string forwarding_port("8000");

GURL forwarding_url(original_url.scheme() + "://" +

@@ -159,8 +159,8 @@ IN_PROC_BROWSER_TEST_F(PortForwardingDisconnectTest, DisconnectOnRelease) {