chrome/browser/extensions/api/permissions/permissions_apitest.cc - Issue 16268017: GTTF: convert some tests in chrome to use EmbeddedTestServer patch nr 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: chrome/browser/extensions/api/permissions/permissions_apitest.cc

Issue 16268017: GTTF: convert some tests in chrome to use EmbeddedTestServer patch nr 1 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 6 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/extensions/api/page_capture/page_capture_apitest.cc ('k') | chrome/browser/extensions/api/proxy/proxy_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/permissions/permissions_apitest.cc

diff --git a/chrome/browser/extensions/api/permissions/permissions_apitest.cc b/chrome/browser/extensions/api/permissions/permissions_apitest.cc

index ef200852edd02c07464cdc775a17c6a007575aad..9928c8c4eef5da3c75f40f96ac4b36bd5f75307d 100644

--- a/chrome/browser/extensions/api/permissions/permissions_apitest.cc

+++ b/chrome/browser/extensions/api/permissions/permissions_apitest.cc

@@ -84,7 +84,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OptionalPermissionsGranted) {

PermissionsRequestFunction::SetIgnoreUserGestureForTests(true);

host_resolver()->AddRule("*.com", "127.0.0.1");

- ASSERT_TRUE(StartTestServer());

+ ASSERT_TRUE(StartEmbeddedTestServer());

EXPECT_TRUE(RunExtensionTest("permissions/optional")) << message_;

}

@@ -95,7 +95,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OptionalPermissionsAutoConfirm) {

PermissionsRequestFunction::SetAutoConfirmForTests(true);

PermissionsRequestFunction::SetIgnoreUserGestureForTests(true);

host_resolver()->AddRule("*.com", "127.0.0.1");

- ASSERT_TRUE(StartTestServer());

+ ASSERT_TRUE(StartEmbeddedTestServer());

EXPECT_TRUE(RunExtensionTest("permissions/optional")) << message_;

}

@@ -114,7 +114,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OptionalPermissionsDeny) {

PermissionsRequestFunction::SetAutoConfirmForTests(false);

PermissionsRequestFunction::SetIgnoreUserGestureForTests(true);

host_resolver()->AddRule("*.com", "127.0.0.1");

- ASSERT_TRUE(StartTestServer());

+ ASSERT_TRUE(StartEmbeddedTestServer());

EXPECT_TRUE(RunExtensionTest("permissions/optional_deny")) << message_;

}

@@ -123,7 +123,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OptionalPermissionsDeny) {

IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OptionalPermissionsGesture) {

PermissionsRequestFunction::SetIgnoreUserGestureForTests(false);

host_resolver()->AddRule("*.com", "127.0.0.1");

- ASSERT_TRUE(StartTestServer());

+ ASSERT_TRUE(StartEmbeddedTestServer());

EXPECT_TRUE(RunExtensionTest("permissions/optional_gesture")) << message_;

}