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

Unified Diff: chrome/browser/chrome_content_browser_client_unittest.cc

Issue 1020683003: Make content::PermissionType an enum class. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix android compile Created 5 years, 9 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/chrome_content_browser_client_unittest.cc
diff --git a/chrome/browser/chrome_content_browser_client_unittest.cc b/chrome/browser/chrome_content_browser_client_unittest.cc
index c0235f18e274e1291ec7d7125084765abfef2745..f1175a1f59627de94a27fac191a831b918c28303 100644
--- a/chrome/browser/chrome_content_browser_client_unittest.cc
+++ b/chrome/browser/chrome_content_browser_client_unittest.cc
@@ -16,11 +16,14 @@
#include "components/variations/entropy_provider.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/navigation_entry.h"
+#include "content/public/browser/permission_type.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/content_switches.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
+using content::PermissionType;
+
namespace chrome {
using ChromeContentBrowserClientTest = testing::Test;
@@ -201,7 +204,7 @@ class PermissionBrowserClientTest : public testing::Test {
public:
PermissionBrowserClientTest() : url_("https://www.google.com") {}
- void CheckPermissionStatus(content::PermissionType type,
+ void CheckPermissionStatus(PermissionType type,
content::PermissionStatus expected) {
EXPECT_EQ(expected, client_.GetPermissionStatus(type, &profile_,
url_.GetOrigin(),
@@ -224,12 +227,12 @@ class PermissionBrowserClientTest : public testing::Test {
TEST_F(PermissionBrowserClientTest, GetPermissionStatusDefault) {
using namespace content;
- CheckPermissionStatus(PERMISSION_MIDI_SYSEX, PERMISSION_STATUS_ASK);
- CheckPermissionStatus(PERMISSION_PUSH_MESSAGING, PERMISSION_STATUS_ASK);
- CheckPermissionStatus(PERMISSION_NOTIFICATIONS, PERMISSION_STATUS_ASK);
- CheckPermissionStatus(PERMISSION_GEOLOCATION, PERMISSION_STATUS_ASK);
+ CheckPermissionStatus(PermissionType::MIDI_SYSEX, PERMISSION_STATUS_ASK);
+ CheckPermissionStatus(PermissionType::PUSH_MESSAGING, PERMISSION_STATUS_ASK);
+ CheckPermissionStatus(PermissionType::NOTIFICATIONS, PERMISSION_STATUS_ASK);
+ CheckPermissionStatus(PermissionType::GEOLOCATION, PERMISSION_STATUS_ASK);
#if defined(OS_ANDROID)
- CheckPermissionStatus(PERMISSION_PROTECTED_MEDIA_IDENTIFIER,
+ CheckPermissionStatus(PermissionType::PROTECTED_MEDIA_IDENTIFIER,
PERMISSION_STATUS_ASK);
#endif
}
@@ -237,21 +240,23 @@ TEST_F(PermissionBrowserClientTest, GetPermissionStatusDefault) {
TEST_F(PermissionBrowserClientTest, GetPermissionStatusAfterSet) {
using namespace content;
SetPermission(CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_ALLOW);
- CheckPermissionStatus(PERMISSION_GEOLOCATION, PERMISSION_STATUS_GRANTED);
+ CheckPermissionStatus(PermissionType::GEOLOCATION, PERMISSION_STATUS_GRANTED);
SetPermission(CONTENT_SETTINGS_TYPE_NOTIFICATIONS, CONTENT_SETTING_ALLOW);
- CheckPermissionStatus(PERMISSION_NOTIFICATIONS, PERMISSION_STATUS_GRANTED);
+ CheckPermissionStatus(PermissionType::NOTIFICATIONS,
+ PERMISSION_STATUS_GRANTED);
SetPermission(CONTENT_SETTINGS_TYPE_MIDI_SYSEX, CONTENT_SETTING_ALLOW);
- CheckPermissionStatus(PERMISSION_MIDI_SYSEX, PERMISSION_STATUS_GRANTED);
+ CheckPermissionStatus(PermissionType::MIDI_SYSEX, PERMISSION_STATUS_GRANTED);
SetPermission(CONTENT_SETTINGS_TYPE_PUSH_MESSAGING, CONTENT_SETTING_ALLOW);
- CheckPermissionStatus(PERMISSION_PUSH_MESSAGING, PERMISSION_STATUS_GRANTED);
+ CheckPermissionStatus(PermissionType::PUSH_MESSAGING,
+ PERMISSION_STATUS_GRANTED);
#if defined(OS_ANDROID)
SetPermission(CONTENT_SETTINGS_TYPE_PROTECTED_MEDIA_IDENTIFIER,
CONTENT_SETTING_ALLOW);
- CheckPermissionStatus(PERMISSION_PROTECTED_MEDIA_IDENTIFIER,
+ CheckPermissionStatus(PermissionType::PROTECTED_MEDIA_IDENTIFIER,
PERMISSION_STATUS_GRANTED);
#endif
}
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/content_settings/permission_context_uma_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698