chrome/browser/geolocation/geolocation_permission_context_unittest.cc - Issue 2713083003: Use ContentSetting in chrome/ instead of PermissionStatus

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/geolocation/geolocation_permission_context_unittest.cc

Issue 2713083003: Use ContentSetting in chrome/ instead of PermissionStatus (Closed)

Patch Set: fix compile hopefully Created 3 years, 10 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/service_worker_apitest.cc ('k') | chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.h » ('j') | chrome/browser/permissions/permission_manager.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/geolocation_permission_context_unittest.cc

diff --git a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc

index e813b9b5916459d4811971aca3b3ee40263d1e28..a8aca90a67947e9cc0cec1eff28d1310d5d92708 100644

--- a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc

+++ b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc

@@ -912,14 +912,14 @@ TEST_F(GeolocationPermissionContextTests, SearchGeolocationInIncognito) {

// A DSE setting of ALLOW should not flow through to incognito.

geo_service->SetDSEGeolocationSetting(true);

- ASSERT_EQ(blink::mojom::PermissionStatus::ASK,

+ ASSERT_EQ(CONTENT_SETTING_ASK,

PermissionManager::Get(otr_profile)

->GetPermissionStatus(CONTENT_SETTINGS_TYPE_GEOLOCATION,

requesting_frame, requesting_frame));

// Changing the setting to BLOCK should flow through to incognito.

geo_service->SetDSEGeolocationSetting(false);

- ASSERT_EQ(blink::mojom::PermissionStatus::DENIED,

+ ASSERT_EQ(CONTENT_SETTING_BLOCK,

PermissionManager::Get(otr_profile)

->GetPermissionStatus(CONTENT_SETTINGS_TYPE_GEOLOCATION,

requesting_frame, requesting_frame));