| Index: chrome/browser/chrome_content_browser_client.h
|
| diff --git a/chrome/browser/chrome_content_browser_client.h b/chrome/browser/chrome_content_browser_client.h
|
| index ab6d1781449764d4fd4c4168851829294005b92f..e792775dffa2126c6dee15f25084c39a5cb6bbe9 100644
|
| --- a/chrome/browser/chrome_content_browser_client.h
|
| +++ b/chrome/browser/chrome_content_browser_client.h
|
| @@ -168,8 +168,11 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
|
| const GURL& url,
|
| content::ResourceContext* context) override;
|
| content::QuotaPermissionContext* CreateQuotaPermissionContext() override;
|
| - std::unique_ptr<storage::QuotaEvictionPolicy>
|
| - GetTemporaryStorageEvictionPolicy(content::BrowserContext* context) override;
|
| + void GetQuotaSettings(
|
| + content::BrowserContext* context,
|
| + content::StoragePartition* partition,
|
| + const storage::OptionalQuotaSettingsCallback& callback) override;
|
| +
|
| void AllowCertificateError(
|
| content::WebContents* web_contents,
|
| int cert_error,
|
| @@ -324,6 +327,7 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
|
|
|
| private:
|
| friend class DisableWebRtcEncryptionFlagTest;
|
| + friend class InProcessBrowserTest;
|
|
|
| #if BUILDFLAG(ENABLE_WEBRTC)
|
| // Copies disable WebRTC encryption switch depending on the channel.
|
| @@ -354,6 +358,11 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
|
| const base::Callback<void(bool)>& callback);
|
| #endif
|
|
|
| + // The value pointed to by |settings| should remain valid until the
|
| + // the function is called again with a new value or a nullptr.
|
| + static void SetDefaultQuotaSettingsForTesting(
|
| + const storage::QuotaSettings *settings);
|
| +
|
| #if BUILDFLAG(ENABLE_PLUGINS)
|
| // Set of origins that can use TCP/UDP private APIs from NaCl.
|
| std::set<std::string> allowed_socket_origins_;
|
|
|