chrome/browser/services/gcm/push_messaging_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/services/gcm/push_messaging_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/services/gcm/push_messaging_permission_context.cc ('k') | chrome/browser/services/gcm/push_messaging_service_impl.h » ('j') | content/public/browser/content_browser_client.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/services/gcm/push_messaging_permission_context_unittest.cc

diff --git a/chrome/browser/services/gcm/push_messaging_permission_context_unittest.cc b/chrome/browser/services/gcm/push_messaging_permission_context_unittest.cc

index a42e2dea04ba00350f9e862fafbcd584ddade28b..f4ca9990f3fa1e1366328303cb2273cb16d54315 100644

--- a/chrome/browser/services/gcm/push_messaging_permission_context_unittest.cc

+++ b/chrome/browser/services/gcm/push_messaging_permission_context_unittest.cc

@@ -34,9 +34,9 @@ class TestPushMessagingPermissionContext

const GURL& embedder_origin,

const BrowserPermissionCallback& callback,

bool persist,

- bool allowed) override {

+ ContentSetting content_setting) override {

was_persisted_ = persist;

- permission_granted_ = allowed;

+ permission_granted_ = content_setting == CONTENT_SETTING_ALLOW;

}

bool was_persisted_;

@@ -137,28 +137,28 @@ TEST_F(PushMessagingPermissionContextTest, DecidePushPermission) {

BrowserPermissionCallback callback;

context.DecidePushPermission(request_id, GURL(kOriginA), GURL(kOriginA),

- callback, false);

+ callback, CONTENT_SETTING_DEFAULT);

EXPECT_FALSE(context.was_persisted());

EXPECT_FALSE(context.was_granted());

SetContentSetting(&profile, CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,

CONTENT_SETTING_ALLOW);

context.DecidePushPermission(request_id, GURL(kOriginA), GURL(kOriginA),

- callback, true);

+ callback, CONTENT_SETTING_ALLOW);

EXPECT_TRUE(context.was_persisted());

EXPECT_TRUE(context.was_granted());

SetContentSetting(&profile, CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,

CONTENT_SETTING_BLOCK);

context.DecidePushPermission(request_id, GURL(kOriginA), GURL(kOriginA),

- callback, true);

+ callback, CONTENT_SETTING_ALLOW);

EXPECT_TRUE(context.was_persisted());

EXPECT_FALSE(context.was_granted());

SetContentSetting(&profile, CONTENT_SETTINGS_TYPE_PUSH_MESSAGING,

CONTENT_SETTING_ASK);

context.DecidePushPermission(request_id, GURL(kOriginA), GURL(kOriginA),

- callback, true);

+ callback, CONTENT_SETTING_ALLOW);

EXPECT_TRUE(context.was_persisted());

EXPECT_TRUE(context.was_granted());

}