| Index: content/browser/permissions/permission_service_context.h
|
| diff --git a/content/browser/permissions/permission_service_context.h b/content/browser/permissions/permission_service_context.h
|
| index 0534ae1b61dfb9132460fffed09e5d343d2fe926..efd4d33744f0fc4d0507dbffdd1ae3cbb55bcb06 100644
|
| --- a/content/browser/permissions/permission_service_context.h
|
| +++ b/content/browser/permissions/permission_service_context.h
|
| @@ -6,14 +6,14 @@
|
| #define CONTENT_BROWSER_PERMISSIONS_PERMISSION_SERVICE_CONTEXT_H_
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_vector.h"
|
| +#include "content/browser/permissions/permission_service_impl.h"
|
| +#include "content/common/permission_service.mojom.h"
|
| #include "content/public/browser/web_contents_observer.h"
|
| +#include "mojo/common/strong_binding_set.h"
|
| #include "mojo/public/cpp/bindings/interface_request.h"
|
|
|
| namespace content {
|
|
|
| -class PermissionService;
|
| -class PermissionServiceImpl;
|
| class RenderFrameHost;
|
| class RenderProcessHost;
|
|
|
| @@ -29,10 +29,6 @@ class PermissionServiceContext : public WebContentsObserver {
|
|
|
| void CreateService(mojo::InterfaceRequest<PermissionService> request);
|
|
|
| - // Called by a PermissionService identified as |service| when it has a
|
| - // connection error in order to get unregistered and killed.
|
| - void ServiceHadConnectionError(PermissionServiceImpl* service);
|
| -
|
| BrowserContext* GetBrowserContext() const;
|
| GURL GetEmbeddingOrigin() const;
|
|
|
| @@ -51,7 +47,7 @@ class PermissionServiceContext : public WebContentsObserver {
|
|
|
| RenderFrameHost* render_frame_host_;
|
| RenderProcessHost* render_process_host_;
|
| - ScopedVector<PermissionServiceImpl> services_;
|
| + mojo::StrongBindingSet<PermissionServiceImpl> services_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(PermissionServiceContext);
|
| };
|
|
|