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 4006d9b93c7d351d86c399324c353ed26e21e114..a3944b53f1f6e91c4f1c6e846cd72567b5c55126 100644 |
--- a/chrome/browser/extensions/api/permissions/permissions_apitest.cc |
+++ b/chrome/browser/extensions/api/permissions/permissions_apitest.cc |
@@ -85,7 +85,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OptionalPermissionsGranted) { |
prefs->AddGrantedPermissions("kjmkgkdkpedkejedfhmfcenooemhbpbo", |
granted_permissions); |
- RequestPermissionsFunction::SetIgnoreUserGestureForTests(true); |
+ PermissionsRequestFunction::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, OptionalPermissionsGranted) { |
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OptionalPermissionsAutoConfirm) { |
// Rather than setting the granted permissions, set the UI autoconfirm flag |
// and run the same tests. |
- RequestPermissionsFunction::SetAutoConfirmForTests(true); |
- RequestPermissionsFunction::SetIgnoreUserGestureForTests(true); |
+ PermissionsRequestFunction::SetAutoConfirmForTests(true); |
+ PermissionsRequestFunction::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, OptionalPermissionsAutoConfirm) { |
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ComplexOptionalPermissions) { |
// Rather than setting the granted permissions, set the UI autoconfirm flag |
// and run the same tests. |
- RequestPermissionsFunction::SetAutoConfirmForTests(true); |
- RequestPermissionsFunction::SetIgnoreUserGestureForTests(true); |
+ PermissionsRequestFunction::SetAutoConfirmForTests(true); |
+ PermissionsRequestFunction::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) { |
- RequestPermissionsFunction::SetAutoConfirmForTests(false); |
- RequestPermissionsFunction::SetIgnoreUserGestureForTests(true); |
+ PermissionsRequestFunction::SetAutoConfirmForTests(false); |
+ PermissionsRequestFunction::SetIgnoreUserGestureForTests(true); |
host_resolver()->AddRule("*.com", "127.0.0.1"); |
ASSERT_TRUE(StartTestServer()); |
EXPECT_TRUE(RunExtensionTest("permissions/optional_deny")) << message_; |
@@ -124,7 +124,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OptionalPermissionsDeny) { |
// Tests that the permissions.request function must be called from within a |
// user gesture. |
IN_PROC_BROWSER_TEST_F(ExtensionApiTest, OptionalPermissionsGesture) { |
- RequestPermissionsFunction::SetIgnoreUserGestureForTests(false); |
+ PermissionsRequestFunction::SetIgnoreUserGestureForTests(false); |
host_resolver()->AddRule("*.com", "127.0.0.1"); |
ASSERT_TRUE(StartTestServer()); |
EXPECT_TRUE(RunExtensionTest("permissions/optional_gesture")) << message_; |