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

Unified Diff: chrome/browser/chromeos/attestation/platform_verification_flow.cc

Issue 1871343002: Remove PermissionContext factories (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/chromeos/attestation/platform_verification_flow.cc
diff --git a/chrome/browser/chromeos/attestation/platform_verification_flow.cc b/chrome/browser/chromeos/attestation/platform_verification_flow.cc
index 794ed3ab3b752afb0adc01945d193650b8815389..f57527add64a92b3a4da9ba0a025bcc17f2ac1e3 100644
--- a/chrome/browser/chromeos/attestation/platform_verification_flow.cc
+++ b/chrome/browser/chromeos/attestation/platform_verification_flow.cc
@@ -17,8 +17,9 @@
#include "chrome/browser/chromeos/attestation/attestation_signed_data.pb.h"
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
-#include "chrome/browser/media/protected_media_identifier_permission_context.h"
-#include "chrome/browser/media/protected_media_identifier_permission_context_factory.h"
+#include "chrome/browser/permissions/permission_context_base.h"
+#include "chrome/browser/permissions/permission_manager.h"
+#include "chrome/browser/permissions/permission_manager_factory.h"
#include "chrome/browser/profiles/profile.h"
#include "chromeos/attestation/attestation_flow.h"
#include "chromeos/chromeos_switches.h"
@@ -105,9 +106,11 @@ class DefaultDelegate : public PlatformVerificationFlow::Delegate {
}
bool IsPermittedByUser(content::WebContents* web_contents) override {
- ProtectedMediaIdentifierPermissionContext* permission_context =
- ProtectedMediaIdentifierPermissionContextFactory::GetForProfile(
- Profile::FromBrowserContext(web_contents->GetBrowserContext()));
+ PermissionContextBase* permission_context =
+ PermissionManagerFactory::GetForProfile(
+ Profile::FromBrowserContext(web_contents->GetBrowserContext()))
+ ->GetPermissionContext(
+ content::PermissionType::PROTECTED_MEDIA_IDENTIFIER);
mlamouri (slow - plz ping) 2016/04/11 14:06:05 I think you could greatly improve that by doing:
raymes 2016/04/12 07:44:54 Done. I considered this but wasn't sure whether to
// TODO(xhwang): Using delegate_->GetURL() here is not right. The platform
// verification may be requested by a frame from a different origin. This

Powered by Google App Engine
This is Rietveld 408576698