chrome/browser/geolocation/geolocation_permission_context_unittest.cc - Issue 955383003: ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool.

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 955383003: ContentBrowserClient::RequestPermission replies with PermissionStatus instead of bool. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix android geolocation breakage Created 5 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

« chrome/browser/content_settings/permission_context_base.cc ('K') | « chrome/browser/geolocation/geolocation_permission_context_extensions.cc ('k') | chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_delegate.h » ('j') | content/public/browser/content_browser_client.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 111844d8622d6903bdcd9945af6e274faffa5214..37e840620f4f0be3d2a75a35fe0d92156f3f3009 100644

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

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

@@ -129,7 +129,7 @@ class GeolocationPermissionContextTests

bool user_gesture);

void PermissionResponse(const PermissionRequestID& id,

- bool allowed);

+ ContentSetting content_setting);

void CheckPermissionMessageSent(int bridge_id, bool allowed);

void CheckPermissionMessageSentForTab(int tab, int bridge_id, bool allowed);

void CheckPermissionMessageSentInternal(MockRenderProcessHost* process,

@@ -190,8 +190,9 @@ void GeolocationPermissionContextTests::RequestGeolocationPermission(

void GeolocationPermissionContextTests::PermissionResponse(

const PermissionRequestID& id,

- bool allowed) {

- responses_[id.render_process_id()] = std::make_pair(id.bridge_id(), allowed);

+ ContentSetting content_setting) {

+ responses_[id.render_process_id()] =

+ std::make_pair(id.bridge_id(), content_setting == CONTENT_SETTING_ALLOW);

}

void GeolocationPermissionContextTests::CheckPermissionMessageSent(