Chromium Code Reviews| Index: chrome/browser/permissions/permission_context_base.h |
| diff --git a/chrome/browser/permissions/permission_context_base.h b/chrome/browser/permissions/permission_context_base.h |
| index 2ab7b7bb8526f3d9729344db2b68602770009fdc..74127257ae67d55dd0878d81453f3be8aad4fbd7 100644 |
| --- a/chrome/browser/permissions/permission_context_base.h |
| +++ b/chrome/browser/permissions/permission_context_base.h |
| @@ -9,9 +9,11 @@ |
| #include "base/callback.h" |
| #include "base/containers/scoped_ptr_hash_map.h" |
| +#include "base/lazy_instance.h" |
| #include "base/memory/ref_counted.h" |
| #include "base/memory/weak_ptr.h" |
| #include "build/build_config.h" |
| +#include "chrome/browser/permissions/permission_decision_auto_blocker.h" |
| #include "chrome/browser/permissions/permission_request.h" |
| #include "components/content_settings/core/common/content_settings.h" |
| #include "components/content_settings/core/common/content_settings_types.h" |
| @@ -157,9 +159,14 @@ class PermissionContextBase : public KeyedService { |
| } |
| private: |
| + friend class PermissionContextBaseTests; |
| + |
| // Called when a request is no longer used so it can be cleaned up. |
| void CleanUpRequest(const PermissionRequestID& id); |
| + base::LazyInstance<PermissionDecisionAutoBlocker> decision_auto_blocker_ = |
|
raymes
2016/08/06 00:50:21
I think we can just use a unique_ptr here (or inst
dominickn
2016/08/08 02:18:28
Done.
|
| + LAZY_INSTANCE_INITIALIZER; |
| + |
| Profile* profile_; |
| const content::PermissionType permission_type_; |
| const ContentSettingsType content_settings_type_; |