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

Unified Diff: chrome/browser/extensions/service_worker_apitest.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
Index: chrome/browser/extensions/service_worker_apitest.cc
diff --git a/chrome/browser/extensions/service_worker_apitest.cc b/chrome/browser/extensions/service_worker_apitest.cc
index 6ca009a572db82afd1ab6de7db023752a800d345..7615b12529c40d16c62fe1ebac29ef398dc99b8a 100644
--- a/chrome/browser/extensions/service_worker_apitest.cc
+++ b/chrome/browser/extensions/service_worker_apitest.cc
@@ -19,11 +19,11 @@
#include "chrome/browser/push_messaging/push_messaging_service_impl.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/test/base/ui_test_utils.h"
+#include "components/content_settings/core/common/content_settings_types.h"
#include "components/gcm_driver/instance_id/fake_gcm_driver_for_instance_id.h"
#include "components/version_info/version_info.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/service_worker_context.h"
#include "content/public/browser/storage_partition.h"
#include "content/public/browser/web_contents.h"
@@ -225,7 +225,7 @@ class ServiceWorkerPushMessagingTest : public ServiceWorkerTest {
DesktopNotificationProfileUtil::GrantPermission(profile(), origin);
ASSERT_EQ(blink::mojom::PermissionStatus::GRANTED,
PermissionManager::Get(profile())->GetPermissionStatus(
- content::PermissionType::NOTIFICATIONS, origin, origin));
+ CONTENT_SETTINGS_TYPE_NOTIFICATIONS, origin, origin));
}
PushMessagingAppIdentifier GetAppIdentifierForServiceWorkerRegistration(

Powered by Google App Engine
This is Rietveld 408576698