media: Pass MediaPermission to MediaDrmBridge

content/renderer/media/media_permission_dispatcher.h

Index: content/renderer/media/media_permission_dispatcher.h
diff --git a/content/renderer/media/media_permission_dispatcher.h b/content/renderer/media/media_permission_dispatcher.h
deleted file mode 100644
index 2a94defebcb133b2bd8170b376fec1fffa30d4f7..0000000000000000000000000000000000000000
--- a/content/renderer/media/media_permission_dispatcher.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// 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 CONTENT_RENDERER_MEDIA_MEDIA_PERMISSION_DISPATCHER_H_
-#define CONTENT_RENDERER_MEDIA_MEDIA_PERMISSION_DISPATCHER_H_
-
-#include <stdint.h>
-
-#include <map>
-
-#include "base/callback.h"
-#include "base/macros.h"
-#include "base/memory/ref_counted.h"
-#include "base/memory/weak_ptr.h"
-#include "content/common/content_export.h"
-#include "media/base/media_permission.h"
-#include "third_party/WebKit/public/platform/modules/permissions/permission.mojom.h"
-
-namespace base {
-class SingleThreadTaskRunner;
-}
-
-namespace content {
-
-// MediaPermission implementation using content PermissionService.
-class CONTENT_EXPORT MediaPermissionDispatcher : public media::MediaPermission {
- public:
-  using ConnectToServiceCB = base::Callback<void(
-      mojo::InterfaceRequest<blink::mojom::PermissionService>)>;
-
-  explicit MediaPermissionDispatcher(
-      const ConnectToServiceCB& connect_to_service_cb);
-  ~MediaPermissionDispatcher() override;
-
-  // media::MediaPermission implementation.
-  // Note: Can be called on any thread. The |permission_status_cb| will always
-  // be fired on the thread where these methods are called.
-  void HasPermission(Type type,
-                     const GURL& security_origin,
-                     const PermissionStatusCB& permission_status_cb) override;
-  void RequestPermission(
-      Type type,
-      const GURL& security_origin,
-      const PermissionStatusCB& permission_status_cb) override;
-
- private:
-  // Map of request IDs and pending PermissionStatusCBs.
-  typedef std::map<uint32_t, PermissionStatusCB> RequestMap;
-
-  // Register PermissionStatusCBs. Returns |request_id| that can be used to make
-  // PermissionService calls.
-  uint32_t RegisterCallback(const PermissionStatusCB& permission_status_cb);
-
-  // Callback for |permission_service_| calls.
-  void OnPermissionStatus(uint32_t request_id,
-                          blink::mojom::PermissionStatus status);
-
-  ConnectToServiceCB connect_to_service_cb_;
-  scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
-  uint32_t next_request_id_;
-  RequestMap requests_;
-  blink::mojom::PermissionServicePtr permission_service_;
-
-  // Used to safely post MediaPermission calls for execution on |task_runner_|.
-  base::WeakPtr<MediaPermissionDispatcher> weak_ptr_;
-
-  base::WeakPtrFactory<MediaPermissionDispatcher> weak_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(MediaPermissionDispatcher);
-};
-
-}  // namespace content
-
-#endif  // CONTENT_RENDERER_MEDIA_MEDIA_PERMISSION_DISPATCHER_H_