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

Unified Diff: chrome/browser/safe_browsing/permission_reporter_unittest.cc

Issue 2675483002: Replace PermissionType in chrome/ with ContentSettingsType (Closed)
Patch Set: rebase + include content_settings_types.h more 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
« no previous file with comments | « chrome/browser/safe_browsing/permission_reporter.cc ('k') | chrome/browser/safe_browsing/ping_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/safe_browsing/permission_reporter_unittest.cc
diff --git a/chrome/browser/safe_browsing/permission_reporter_unittest.cc b/chrome/browser/safe_browsing/permission_reporter_unittest.cc
index 3910ea8cd129034b1f5dd85025fee468b2ad4a42..fd4996d335ce511452a299f6659d9f3e39900a70 100644
--- a/chrome/browser/safe_browsing/permission_reporter_unittest.cc
+++ b/chrome/browser/safe_browsing/permission_reporter_unittest.cc
@@ -13,11 +13,8 @@
#include "chrome/browser/safe_browsing/mock_permission_report_sender.h"
#include "chrome/common/safe_browsing/permission_report.pb.h"
#include "components/variations/active_field_trials.h"
-#include "content/public/browser/permission_type.h"
#include "testing/gtest/include/gtest/gtest.h"
-using content::PermissionType;
-
namespace safe_browsing {
namespace {
@@ -31,8 +28,10 @@ const int kMaximumReportsPerOriginPerPermissionPerMinute = 5;
const char kDummyOriginOne[] = "http://example.test/";
const char kDummyOriginTwo[] = "http://example2.test/";
-const PermissionType kDummyPermissionOne = PermissionType::GEOLOCATION;
-const PermissionType kDummyPermissionTwo = PermissionType::NOTIFICATIONS;
+const ContentSettingsType kDummyPermissionOne =
+ CONTENT_SETTINGS_TYPE_GEOLOCATION;
+const ContentSettingsType kDummyPermissionTwo =
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS;
const PermissionAction kDummyAction = GRANTED;
const PermissionSourceUI kDummySourceUI = PermissionSourceUI::PROMPT;
const PermissionRequestGestureType kDummyGestureType =
@@ -58,7 +57,7 @@ struct base::Feature kFeatureOffByDefault {
};
PermissionReportInfo BuildDummyReportInfo(const char* requesting_origin,
- PermissionType permission) {
+ ContentSettingsType permission) {
PermissionReportInfo info(GURL(requesting_origin), permission, kDummyAction,
kDummySourceUI, kDummyGestureType, kDummyPersistDecision,
kDummyNumPriorDismissals, kDummyNumPriorIgnores);
« no previous file with comments | « chrome/browser/safe_browsing/permission_reporter.cc ('k') | chrome/browser/safe_browsing/ping_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698