Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2327)

Unified Diff: chrome/browser/geolocation/geolocation_permission_context_unittest.cc

Issue 2713083003: Use ContentSetting in chrome/ instead of PermissionStatus (Closed)
Patch Set: maybe fix android compile + address comments + basic tests 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
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..76b8701c68160c0862bf033d6ca31fec1033a95e 100644
--- a/chrome/browser/geolocation/geolocation_permission_context_unittest.cc
+++ b/chrome/browser/geolocation/geolocation_permission_context_unittest.cc
@@ -912,16 +912,18 @@ 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));
+ requesting_frame, requesting_frame)
+ .content_setting);
// 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));
+ requesting_frame, requesting_frame)
+ .content_setting);
}
#endif // defined(OS_ANDROID)

Powered by Google App Engine
This is Rietveld 408576698