chrome/browser/extensions/api/permissions/permissions_apitest.cc - Issue 11778097: Revert revision 176015

Unified Diff: chrome/browser/extensions/api/permissions/permissions_apitest.cc

Issue 11778097: Revert revision 176015 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 7 years, 11 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

« no previous file with comments | « chrome/browser/extensions/api/permissions/permissions_api.cc ('k') | chrome/browser/extensions/api/processes/processes_api.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

===================================================================

--- chrome/browser/extensions/api/permissions/permissions_apitest.cc (revision 176052)

+++ chrome/browser/extensions/api/permissions/permissions_apitest.cc (working copy)

@@ -85,7 +85,7 @@

prefs->AddGrantedPermissions("kjmkgkdkpedkejedfhmfcenooemhbpbo",

granted_permissions);

- PermissionsRequestFunction::SetIgnoreUserGestureForTests(true);

+ RequestPermissionsFunction::SetIgnoreUserGestureForTests(true);

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

ASSERT_TRUE(StartTestServer());

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

@@ -95,8 +95,8 @@

IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OptionalPermissionsAutoConfirm) {

// Rather than setting the granted permissions, set the UI autoconfirm flag

// and run the same tests.

- PermissionsRequestFunction::SetAutoConfirmForTests(true);

- PermissionsRequestFunction::SetIgnoreUserGestureForTests(true);

+ RequestPermissionsFunction::SetAutoConfirmForTests(true);

+ RequestPermissionsFunction::SetIgnoreUserGestureForTests(true);

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

ASSERT_TRUE(StartTestServer());

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

@@ -107,15 +107,15 @@

IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ComplexOptionalPermissions) {

// Rather than setting the granted permissions, set the UI autoconfirm flag

// and run the same tests.

- PermissionsRequestFunction::SetAutoConfirmForTests(true);

- PermissionsRequestFunction::SetIgnoreUserGestureForTests(true);

+ RequestPermissionsFunction::SetAutoConfirmForTests(true);

+ RequestPermissionsFunction::SetIgnoreUserGestureForTests(true);

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

}

// Test that denying the optional permissions confirmation dialog works.

IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OptionalPermissionsDeny) {

- PermissionsRequestFunction::SetAutoConfirmForTests(false);

- PermissionsRequestFunction::SetIgnoreUserGestureForTests(true);

+ RequestPermissionsFunction::SetAutoConfirmForTests(false);

+ RequestPermissionsFunction::SetIgnoreUserGestureForTests(true);

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

ASSERT_TRUE(StartTestServer());

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

@@ -124,7 +124,7 @@

// Tests that the permissions.request function must be called from within a

// user gesture.

IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OptionalPermissionsGesture) {

- PermissionsRequestFunction::SetIgnoreUserGestureForTests(false);

+ RequestPermissionsFunction::SetIgnoreUserGestureForTests(false);

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

ASSERT_TRUE(StartTestServer());

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