Remove PermissionContext factories

chrome/browser/chromeos/attestation/platform_verification_flow.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/attestation/platform_verification_flow.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/time/time.h"
 #include "base/timer/timer.h"
 #include "chrome/browser/chromeos/attestation/attestation_ca_client.h"
 #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"
 #include "chromeos/cryptohome/async_method_caller.h"
 #include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "components/content_settings/core/common/content_settings_pattern.h"
 #include "components/user_manager/user.h"
@@ skipping 66 matching lines @@
     return url;
   }
 
   const user_manager::User* GetUser(
       content::WebContents* web_contents) override {
     return ProfileHelper::Get()->GetUserByProfile(
         Profile::FromBrowserContext(web_contents->GetBrowserContext()));
   }
 
   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:

PermissionStatus status =
PermissionManager::Get(Profile::FromBrowserContext(web_contents->GetBrowserContext()))->GetPermissionStatus(content::PermissionType::PROTECTED_MEDIA_IDENTIFIER);

Fully remove the usage of content settings and PermissionContextBase.

[raymes, 2016/04/12 07:44:54]

Done. I considered this but wasn't sure whether to do it in this CL. I've done
it now :)

 
     // TODO(xhwang): Using delegate_->GetURL() here is not right. The platform
     // verification may be requested by a frame from a different origin. This
     // will be solved when http://crbug.com/454847 is fixed.
     const GURL& requesting_origin = GetURL(web_contents).GetOrigin();
 
     GURL embedding_origin = web_contents->GetLastCommittedURL().GetOrigin();
 
     ContentSetting content_setting = permission_context->GetPermissionStatus(
         requesting_origin, embedding_origin);
@@ skipping 301 matching lines @@
   if (!operation_success) {
     LOG(WARNING) << "PlatformVerificationFlow: Failed to renew platform "
                     "certificate.";
     return;
   }
   VLOG(1) << "Certificate successfully renewed.";
 }
 
 }  // namespace attestation
 }  // namespace chromeos