content/browser/devtools/site_per_process_devtools_browsertest.cc - Issue 2263843002: DevTools: merge devtools target with devtools host, part 1

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: content/browser/devtools/site_per_process_devtools_browsertest.cc

Issue 2263843002: DevTools: merge devtools target with devtools host, part 1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: for landing 3 Created 4 years, 4 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 | « content/browser/devtools/shared_worker_devtools_agent_host.cc ('k') | content/browser/devtools/worker_devtools_agent_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/devtools/site_per_process_devtools_browsertest.cc

diff --git a/content/browser/devtools/site_per_process_devtools_browsertest.cc b/content/browser/devtools/site_per_process_devtools_browsertest.cc

index 315b87521761b59562f2019c2286a52386e54fb2..74f4adb82e322b83279c1bb33668c77ee2092ebf 100644

--- a/content/browser/devtools/site_per_process_devtools_browsertest.cc

+++ b/content/browser/devtools/site_per_process_devtools_browsertest.cc

@@ -74,7 +74,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessDevToolsBrowserTest,

list = DevToolsAgentHost::GetOrCreateAll();

EXPECT_EQ(1U, list.size());

- EXPECT_EQ(DevToolsAgentHost::TYPE_WEB_CONTENTS, list[0]->GetType());

+ EXPECT_EQ(DevToolsAgentHost::kTypePage, list[0]->GetType());

EXPECT_EQ(main_url.spec(), list[0]->GetURL().spec());

// Load same-site page into iframe.

@@ -84,7 +84,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessDevToolsBrowserTest,

list = DevToolsAgentHost::GetOrCreateAll();

EXPECT_EQ(1U, list.size());

- EXPECT_EQ(DevToolsAgentHost::TYPE_WEB_CONTENTS, list[0]->GetType());

+ EXPECT_EQ(DevToolsAgentHost::kTypePage, list[0]->GetType());

EXPECT_EQ(main_url.spec(), list[0]->GetURL().spec());

// Load cross-site page into iframe.

@@ -96,9 +96,9 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessDevToolsBrowserTest,

list = DevToolsAgentHost::GetOrCreateAll();

EXPECT_EQ(2U, list.size());

- EXPECT_EQ(DevToolsAgentHost::TYPE_WEB_CONTENTS, list[0]->GetType());

+ EXPECT_EQ(DevToolsAgentHost::kTypePage, list[0]->GetType());

EXPECT_EQ(main_url.spec(), list[0]->GetURL().spec());

- EXPECT_EQ(DevToolsAgentHost::TYPE_FRAME, list[1]->GetType());

+ EXPECT_EQ(DevToolsAgentHost::kTypePage, list[1]->GetType());

EXPECT_EQ(cross_site_url.spec(), list[1]->GetURL().spec());

// Attaching to both agent hosts.

@@ -121,7 +121,7 @@ IN_PROC_BROWSER_TEST_F(SitePerProcessDevToolsBrowserTest,

list = DevToolsAgentHost::GetOrCreateAll();

EXPECT_EQ(1U, list.size());

- EXPECT_EQ(DevToolsAgentHost::TYPE_WEB_CONTENTS, list[0]->GetType());

+ EXPECT_EQ(DevToolsAgentHost::kTypePage, list[0]->GetType());

EXPECT_EQ(main_url.spec(), list[0]->GetURL().spec());

EXPECT_TRUE(child_client.closed());

child_host->DetachClient(&child_client);