chrome/browser/ui/website_settings/permission_bubble_manager_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/ui/website_settings/permission_bubble_manager_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/ui/views/frame/browser_view_focus_uitest.cc ('k') | chrome/browser/ui/webui/downloads_dom_handler_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/website_settings/permission_bubble_manager_browsertest.cc

diff --git a/chrome/browser/ui/website_settings/permission_bubble_manager_browsertest.cc b/chrome/browser/ui/website_settings/permission_bubble_manager_browsertest.cc

index 503c7dce81011a5b3a542012589e57f65e7327dc..eab27b2dad720573df5479a21b294ad16553defb 100644

--- a/chrome/browser/ui/website_settings/permission_bubble_manager_browsertest.cc

+++ b/chrome/browser/ui/website_settings/permission_bubble_manager_browsertest.cc

@@ -52,7 +52,7 @@ class PermissionBubbleManagerBrowserTest : public InProcessBrowserTest {

#endif

IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest,

MAYBE_RequestsBeforeLoad) {

- ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());

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

ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(

browser(),

@@ -67,7 +67,7 @@ IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest,

// Requests before the load should not be bundled with a request after the load.

IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest,

RequestsBeforeAfterLoad) {

- ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());

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

ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(

browser(),

@@ -89,7 +89,7 @@ IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest,

#define MAYBE_NavTwice NavTwice

#endif

IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest, MAYBE_NavTwice) {

- ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());

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

ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(

browser(),

@@ -117,7 +117,7 @@ IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest, MAYBE_NavTwice) {

#endif

IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest,

MAYBE_NavTwiceWithHash) {

- ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());

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

ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(

browser(),

@@ -138,7 +138,7 @@ IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest,

// Bubble requests should be shown after in-page navigation.

IN_PROC_BROWSER_TEST_F(PermissionBubbleManagerBrowserTest, InPageNavigation) {

- ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());

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

ui_test_utils::NavigateToURLBlockUntilNavigationsComplete(

browser(),