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

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

Issue 1527183003: Change mojo enums to be scoped enums in the generated C++ bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-binding-equals
Patch Set: rebase Created 4 years, 11 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/permissions/permission_manager.cc ('k') | chrome/browser/permissions/permission_uma_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/permissions/permission_manager_unittest.cc
diff --git a/chrome/browser/permissions/permission_manager_unittest.cc b/chrome/browser/permissions/permission_manager_unittest.cc
index 8144f4f3293c23a0c8f2f62e625972bdae61f1c1..cd3926f195a7c51ddd0d5070de31e7f40caf87ce 100644
--- a/chrome/browser/permissions/permission_manager_unittest.cc
+++ b/chrome/browser/permissions/permission_manager_unittest.cc
@@ -45,8 +45,7 @@ class PermissionManagerTest : public testing::Test {
: url_("https://example.com"),
other_url_("https://foo.com"),
callback_called_(false),
- callback_result_(content::PERMISSION_STATUS_ASK) {
- }
+ callback_result_(content::PermissionStatus::ASK) {}
PermissionManager* GetPermissionManager() {
return profile_.GetPermissionManager();
@@ -85,7 +84,7 @@ class PermissionManagerTest : public testing::Test {
void Reset() {
callback_called_ = false;
- callback_result_ = content::PERMISSION_STATUS_ASK;
+ callback_result_ = content::PermissionStatus::ASK;
}
private:
@@ -99,41 +98,41 @@ class PermissionManagerTest : public testing::Test {
TEST_F(PermissionManagerTest, GetPermissionStatusDefault) {
CheckPermissionStatus(PermissionType::MIDI_SYSEX,
- content::PERMISSION_STATUS_ASK);
+ content::PermissionStatus::ASK);
CheckPermissionStatus(PermissionType::PUSH_MESSAGING,
- content::PERMISSION_STATUS_ASK);
+ content::PermissionStatus::ASK);
CheckPermissionStatus(PermissionType::NOTIFICATIONS,
- content::PERMISSION_STATUS_ASK);
+ content::PermissionStatus::ASK);
CheckPermissionStatus(PermissionType::GEOLOCATION,
- content::PERMISSION_STATUS_ASK);
+ content::PermissionStatus::ASK);
#if defined(OS_ANDROID)
CheckPermissionStatus(PermissionType::PROTECTED_MEDIA_IDENTIFIER,
- content::PERMISSION_STATUS_ASK);
+ content::PermissionStatus::ASK);
#endif
}
TEST_F(PermissionManagerTest, GetPermissionStatusAfterSet) {
SetPermission(CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_ALLOW);
CheckPermissionStatus(PermissionType::GEOLOCATION,
- content::PERMISSION_STATUS_GRANTED);
+ content::PermissionStatus::GRANTED);
SetPermission(CONTENT_SETTINGS_TYPE_NOTIFICATIONS, CONTENT_SETTING_ALLOW);
CheckPermissionStatus(PermissionType::NOTIFICATIONS,
- content::PERMISSION_STATUS_GRANTED);
+ content::PermissionStatus::GRANTED);
SetPermission(CONTENT_SETTINGS_TYPE_MIDI_SYSEX, CONTENT_SETTING_ALLOW);
CheckPermissionStatus(PermissionType::MIDI_SYSEX,
- content::PERMISSION_STATUS_GRANTED);
+ content::PermissionStatus::GRANTED);
SetPermission(CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, CONTENT_SETTING_ALLOW);
CheckPermissionStatus(PermissionType::PUSH_MESSAGING,
- content::PERMISSION_STATUS_GRANTED);
+ content::PermissionStatus::GRANTED);
#if defined(OS_ANDROID)
SetPermission(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
CONTENT_SETTING_ALLOW);
CheckPermissionStatus(PermissionType::PROTECTED_MEDIA_IDENTIFIER,
- content::PERMISSION_STATUS_GRANTED);
+ content::PermissionStatus::GRANTED);
#endif
}
@@ -151,7 +150,7 @@ TEST_F(PermissionManagerTest, SameTypeChangeNotifies) {
CONTENT_SETTING_ALLOW);
EXPECT_TRUE(callback_called());
- EXPECT_EQ(content::PERMISSION_STATUS_GRANTED, callback_result());
+ EXPECT_EQ(content::PermissionStatus::GRANTED, callback_result());
GetPermissionManager()->UnsubscribePermissionStatusChange(subscription_id);
}
@@ -242,7 +241,7 @@ TEST_F(PermissionManagerTest, WildCardPatternNotifies) {
CONTENT_SETTING_ALLOW);
EXPECT_TRUE(callback_called());
- EXPECT_EQ(content::PERMISSION_STATUS_GRANTED, callback_result());
+ EXPECT_EQ(content::PermissionStatus::GRANTED, callback_result());
GetPermissionManager()->UnsubscribePermissionStatusChange(subscription_id);
}
@@ -264,7 +263,7 @@ TEST_F(PermissionManagerTest, ClearSettingsNotifies) {
CONTENT_SETTINGS_TYPE_GEOLOCATION);
EXPECT_TRUE(callback_called());
- EXPECT_EQ(content::PERMISSION_STATUS_ASK, callback_result());
+ EXPECT_EQ(content::PermissionStatus::ASK, callback_result());
GetPermissionManager()->UnsubscribePermissionStatusChange(subscription_id);
}
@@ -283,7 +282,7 @@ TEST_F(PermissionManagerTest, NewValueCorrectlyPassed) {
CONTENT_SETTING_BLOCK);
EXPECT_TRUE(callback_called());
- EXPECT_EQ(content::PERMISSION_STATUS_DENIED, callback_result());
+ EXPECT_EQ(content::PermissionStatus::DENIED, callback_result());
GetPermissionManager()->UnsubscribePermissionStatusChange(subscription_id);
}
@@ -334,7 +333,7 @@ TEST_F(PermissionManagerTest, ChangesBackAndForth) {
CONTENT_SETTING_ALLOW);
EXPECT_TRUE(callback_called());
- EXPECT_EQ(content::PERMISSION_STATUS_GRANTED, callback_result());
+ EXPECT_EQ(content::PermissionStatus::GRANTED, callback_result());
Reset();
@@ -346,7 +345,7 @@ TEST_F(PermissionManagerTest, ChangesBackAndForth) {
CONTENT_SETTING_ASK);
EXPECT_TRUE(callback_called());
- EXPECT_EQ(content::PERMISSION_STATUS_ASK, callback_result());
+ EXPECT_EQ(content::PermissionStatus::ASK, callback_result());
GetPermissionManager()->UnsubscribePermissionStatusChange(subscription_id);
}
« no previous file with comments | « chrome/browser/permissions/permission_manager.cc ('k') | chrome/browser/permissions/permission_uma_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698