| 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 84551bf7b786c2cf326c75a002597f42e91c89e7..7b6e2066df97901bc1552c53dda3345a8c8d9eb0 100644
|
| --- a/chrome/browser/chrome_content_browser_client.h
|
| +++ b/chrome/browser/chrome_content_browser_client.h
|
| @@ -171,11 +171,8 @@ class ChromeContentBrowserClient : public content::ContentBrowserClient {
|
| const GURL& url,
|
| content::ResourceContext* context) override;
|
| content::QuotaPermissionContext* CreateQuotaPermissionContext() override;
|
| - void GetQuotaSettings(
|
| - content::BrowserContext* context,
|
| - content::StoragePartition* partition,
|
| - const storage::OptionalQuotaSettingsCallback& callback) override;
|
| -
|
| + std::unique_ptr<storage::QuotaEvictionPolicy>
|
| + GetTemporaryStorageEvictionPolicy(content::BrowserContext* context) override;
|
| void AllowCertificateError(
|
| content::WebContents* web_contents,
|
| int cert_error,
|
| @@ -330,7 +327,6 @@ 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.
|
| @@ -361,11 +357,6 @@ 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_;
|
|
|