Change MediaPermission not to use PermissionContext directly

chrome/browser/permissions/permission_manager.h

 // Copyright 2015 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.
 
 #ifndef CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_H_
 #define CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_H_
 
 #include <unordered_map>
 
 #include "base/callback_forward.h"
@@ skipping 50 matching lines @@
                                const GURL& requesting_origin,
                                const GURL& embedding_origin) override;
   int SubscribePermissionStatusChange(
       content::PermissionType permission,
       const GURL& requesting_origin,
       const GURL& embedding_origin,
       const base::Callback<void(blink::mojom::PermissionStatus)>& callback)
       override;
   void UnsubscribePermissionStatusChange(int subscription_id) override;
 
+  // TODO(raymes): Rather than exposing this, expose a denial reason from
+  // GetPermissionStatus so that callers can determine whether a permission is
+  // denied due to the kill switch.
+  bool IsPermissionKillSwitchOn(content::PermissionType permission);
+
  private:
   friend class GeolocationPermissionContextTests;
-  // TODO(raymes): Refactor MediaPermission to not call GetPermissionContext.
-  // See crbug.com/596786.
-  friend class MediaPermission;
 
   class PendingRequest;
   using PendingRequestsMap = IDMap<std::unique_ptr<PendingRequest>>;
 
   struct Subscription;
   using SubscriptionsMap = IDMap<std::unique_ptr<Subscription>>;
 
   PermissionContextBase* GetPermissionContext(content::PermissionType type);
 
   // Called when a permission was decided for a given PendingRequest. The
   // PendingRequest is identified by its |request_id| and the permission is
   // identified by its |permission_id|. If the PendingRequest contains more than
   // one permission, it will wait for the remaining permissions to be resolved.
   // When all the permissions have been resolved, the PendingRequest's callback
   // is run.
   void OnPermissionsRequestResponseStatus(
       int request_id,
       int permission_id,
       blink::mojom::PermissionStatus status);
 
   // content_settings::Observer implementation.
   void OnContentSettingChanged(const ContentSettingsPattern& primary_pattern,
                                const ContentSettingsPattern& secondary_pattern,
                                ContentSettingsType content_type,
                                std::string resource_identifier) override;
 
+  ContentSetting GetPermissionStatusInternal(content::PermissionType permission,
+                                             const GURL& requesting_origin,
+                                             const GURL& embedding_origin);
+
   Profile* profile_;
   PendingRequestsMap pending_requests_;
   SubscriptionsMap subscriptions_;
 
   std::unordered_map<content::PermissionType,
                      std::unique_ptr<PermissionContextBase>,
                      PermissionTypeHash>
       permission_contexts_;
 
   base::WeakPtrFactory<PermissionManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionManager);
 };
 
 #endif // CHROME_BROWSER_PERMISSIONS_PERMISSION_MANAGER_H_