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

Unified Diff: chrome/browser/permissions/permission_context_base_unittest.cc

Issue 2686463002: Add a source to the result of PermissionContextBase::GetPermissionStatus (Closed)
Patch Set: Add a source to the result of PermissionContextBase::GetPermissionStatus 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/permissions/permission_context_base_unittest.cc
diff --git a/chrome/browser/permissions/permission_context_base_unittest.cc b/chrome/browser/permissions/permission_context_base_unittest.cc
index bc030decca70b2d3fc2e273b7cdbae5a0a8df8b9..5c6d8140447a51bc3ffe348a6713ced2d647ec56 100644
--- a/chrome/browser/permissions/permission_context_base_unittest.cc
+++ b/chrome/browser/permissions/permission_context_base_unittest.cc
@@ -375,7 +375,10 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
ASSERT_EQ(1u, permission_context.decisions().size());
EXPECT_EQ(CONTENT_SETTING_ASK, permission_context.decisions()[0]);
EXPECT_TRUE(permission_context.tab_context_updated());
- EXPECT_EQ(expected, permission_context.GetPermissionStatus(url, url));
+ PermissionResult result =
+ permission_context.GetPermissionStatus(url, url);
+ EXPECT_EQ(expected, result.content_setting);
+ EXPECT_EQ(PermissionStatusSource::UNSPECIFIED, result.source);
}
TestPermissionContext permission_context(profile(), permission_type,
@@ -394,8 +397,9 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
base::Bind(&TestPermissionContext::TrackPermissionDecision,
base::Unretained(&permission_context)));
- EXPECT_EQ(CONTENT_SETTING_BLOCK,
- permission_context.GetPermissionStatus(url, url));
+ PermissionResult result = permission_context.GetPermissionStatus(url, url);
+ EXPECT_EQ(CONTENT_SETTING_BLOCK, result.content_setting);
+ EXPECT_EQ(PermissionStatusSource::UNSPECIFIED, result.source);
}
void TestBlockOnSeveralDismissals_TestContent() {
@@ -514,7 +518,10 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
EXPECT_EQ(1u, permission_context.decisions().size());
ASSERT_EQ(CONTENT_SETTING_ASK, permission_context.decisions()[0]);
EXPECT_TRUE(permission_context.tab_context_updated());
- EXPECT_EQ(expected, permission_context.GetPermissionStatus(url, url));
+ PermissionResult result =
+ permission_context.GetPermissionStatus(url, url);
+ EXPECT_EQ(expected, result.content_setting);
+ EXPECT_EQ(PermissionStatusSource::UNSPECIFIED, result.source);
histograms.ExpectTotalCount(
"Permissions.Prompt.Dismissed.PriorDismissCount.MidiSysEx", i + 1);
@@ -538,8 +545,10 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
TestPermissionContext permission_context(
profile(), content::PermissionType::MIDI_SYSEX,
CONTENT_SETTINGS_TYPE_MIDI_SYSEX);
- EXPECT_EQ(CONTENT_SETTING_BLOCK,
- permission_context.GetPermissionStatus(url, url));
+ PermissionResult result = permission_context.GetPermissionStatus(url, url);
+ EXPECT_EQ(CONTENT_SETTING_BLOCK, result.content_setting);
+ EXPECT_EQ(PermissionStatusSource::UNSPECIFIED, result.source);
+
variations::testing::ClearAllVariationParams();
}
@@ -707,8 +716,9 @@ class PermissionContextBaseTests : public ChromeRenderViewHostTestHarness {
web_contents(), id, url, true /* user_gesture */,
base::Bind(&TestPermissionContext::TrackPermissionDecision,
base::Unretained(&permission_context)));
- EXPECT_EQ(expected_permission_status,
- permission_context.GetPermissionStatus(url, url));
+ PermissionResult result = permission_context.GetPermissionStatus(url, url);
+ EXPECT_EQ(expected_permission_status, result.content_setting);
+ EXPECT_EQ(PermissionStatusSource::UNSPECIFIED, result.source);
if (expected_permission_status == CONTENT_SETTING_ALLOW) {
ASSERT_EQ(1u, permission_context.decisions().size());
« no previous file with comments | « chrome/browser/permissions/permission_context_base.cc ('k') | chrome/browser/permissions/permission_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698