Commit f3dc22ca authored by Yeol's avatar Yeol Committed by Commit Bot

Changed ContentBrowserClient::CreateQuotaPermissionContext() to return scoped_refptr.

QuotaPermissionContext is a base::RefCountedThreadSafe class.
The method should return scoped_refptr instead of the raw pointer.

Bug: 951154
Change-Id: Ida5c64b6b5ce9eea6d3b42b49c0ab25b0263778e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1569376Reviewed-by: default avatarLuke Halliwell <halliwell@chromium.org>
Reviewed-by: default avatarAvi Drissman <avi@chromium.org>
Reviewed-by: default avatarSami Kyöstilä <skyostil@chromium.org>
Reviewed-by: default avatarBo <boliu@chromium.org>
Commit-Queue: Yeol Park <peary2@gmail.com>
Cr-Commit-Position: refs/heads/master@{#652204}
parent de977289
......@@ -542,7 +542,7 @@ bool AwContentBrowserClient::AllowWorkerIndexedDB(
return true;
}
content::QuotaPermissionContext*
scoped_refptr<content::QuotaPermissionContext>
AwContentBrowserClient::CreateQuotaPermissionContext() {
return new AwQuotaPermissionContext;
}
......
......@@ -106,7 +106,8 @@ class AwContentBrowserClient : public content::ContentBrowserClient {
const GURL& url,
content::ResourceContext* context,
const std::vector<content::GlobalFrameRoutingId>& render_frames) override;
content::QuotaPermissionContext* CreateQuotaPermissionContext() override;
scoped_refptr<content::QuotaPermissionContext> CreateQuotaPermissionContext()
override;
void GetQuotaSettings(
content::BrowserContext* context,
content::StoragePartition* partition,
......
......@@ -2690,7 +2690,7 @@ bool ChromeContentBrowserClient::ShouldUseGmsCoreGeolocationProvider() {
}
#endif
QuotaPermissionContext*
scoped_refptr<content::QuotaPermissionContext>
ChromeContentBrowserClient::CreateQuotaPermissionContext() {
return new ChromeQuotaPermissionContext();
}
......
......@@ -280,8 +280,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
#if defined(OS_ANDROID)
bool ShouldUseGmsCoreGeolocationProvider() override;
#endif
content::QuotaPermissionContext* CreateQuotaPermissionContext() override;
scoped_refptr<content::QuotaPermissionContext> CreateQuotaPermissionContext()
override;
void GetQuotaSettings(
content::BrowserContext* context,
content::StoragePartition* partition,
......
......@@ -656,7 +656,7 @@ std::string CastContentBrowserClient::GetApplicationLocale() {
return locale.empty() ? "en-US" : locale;
}
content::QuotaPermissionContext*
scoped_refptr<content::QuotaPermissionContext>
CastContentBrowserClient::CreateQuotaPermissionContext() {
return new CastQuotaPermissionContext();
}
......
......@@ -147,7 +147,8 @@ class CastContentBrowserClient
content::WebPreferences* prefs) override;
void ResourceDispatcherHostCreated() override;
std::string GetApplicationLocale() override;
content::QuotaPermissionContext* CreateQuotaPermissionContext() override;
scoped_refptr<content::QuotaPermissionContext> CreateQuotaPermissionContext()
override;
void GetQuotaSettings(
content::BrowserContext* context,
content::StoragePartition* partition,
......
......@@ -397,7 +397,8 @@ std::string ContentBrowserClient::GetWebBluetoothBlocklist() {
return std::string();
}
QuotaPermissionContext* ContentBrowserClient::CreateQuotaPermissionContext() {
scoped_refptr<QuotaPermissionContext>
ContentBrowserClient::CreateQuotaPermissionContext() {
return nullptr;
}
......
......@@ -30,6 +30,7 @@
#include "content/public/browser/navigation_throttle.h"
#include "content/public/browser/overlay_window.h"
#include "content/public/browser/page_visibility_state.h"
#include "content/public/browser/quota_permission_context.h"
#include "content/public/browser/resource_request_info.h"
#include "content/public/common/content_client.h"
#include "content/public/common/previews_state.h"
......@@ -732,7 +733,7 @@ class CONTENT_EXPORT ContentBrowserClient {
bool* in_memory);
// Create and return a new quota permission context.
virtual QuotaPermissionContext* CreateQuotaPermissionContext();
virtual scoped_refptr<QuotaPermissionContext> CreateQuotaPermissionContext();
// Allows the embedder to provide settings that determine the amount
// of disk space that may be used by content facing storage apis like
......
......@@ -428,7 +428,7 @@ WebContentsViewDelegate* ShellContentBrowserClient::GetWebContentsViewDelegate(
return CreateShellWebContentsViewDelegate(web_contents);
}
QuotaPermissionContext*
scoped_refptr<content::QuotaPermissionContext>
ShellContentBrowserClient::CreateQuotaPermissionContext() {
return new ShellQuotaPermissionContext();
}
......
......@@ -59,7 +59,8 @@ class ShellContentBrowserClient : public ContentBrowserClient {
std::string GetDefaultDownloadName() override;
WebContentsViewDelegate* GetWebContentsViewDelegate(
WebContents* web_contents) override;
QuotaPermissionContext* CreateQuotaPermissionContext() override;
scoped_refptr<content::QuotaPermissionContext> CreateQuotaPermissionContext()
override;
void GetQuotaSettings(
content::BrowserContext* context,
content::StoragePartition* partition,
......
......@@ -166,7 +166,7 @@ void HeadlessContentBrowserClient::RegisterOutOfProcessServices(
#endif
}
content::QuotaPermissionContext*
scoped_refptr<content::QuotaPermissionContext>
HeadlessContentBrowserClient::CreateQuotaPermissionContext() {
return new HeadlessQuotaPermissionContext();
}
......
......@@ -27,7 +27,8 @@ class HeadlessContentBrowserClient : public content::ContentBrowserClient {
base::Optional<service_manager::Manifest> GetServiceManifestOverlay(
base::StringPiece name) override;
void RegisterOutOfProcessServices(OutOfProcessServiceMap* services) override;
content::QuotaPermissionContext* CreateQuotaPermissionContext() override;
scoped_refptr<content::QuotaPermissionContext> CreateQuotaPermissionContext()
override;
void GetQuotaSettings(
content::BrowserContext* context,
content::StoragePartition* partition,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment