From 96f9611cf49812a8b5ae08fa0825182ba5b505cd Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Wed, 9 Jan 2019 12:16:33 -0800 Subject: [PATCH] GetCachePath replaced with GetGeneratedCodeCacheSettings https://chromium-review.googlesource.com/c/1301973 https://chromium-review.googlesource.com/c/chromium/src/+/1213093 --- atom/browser/atom_browser_client.cc | 11 +++++++++++ atom/browser/atom_browser_client.h | 2 ++ atom/browser/atom_browser_context.cc | 5 ----- atom/browser/atom_browser_context.h | 1 - 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/atom/browser/atom_browser_client.cc b/atom/browser/atom_browser_client.cc index dbc8b5d348d..69bf3901399 100644 --- a/atom/browser/atom_browser_client.cc +++ b/atom/browser/atom_browser_client.cc @@ -525,6 +525,17 @@ AtomBrowserClient::CreateQuotaPermissionContext() { return new AtomQuotaPermissionContext; } +content::GeneratedCodeCacheSettings +AtomBrowserClient::GetGeneratedCodeCacheSettings( + content::BrowserContext* context) { + // TODO(deepak1556): Use platform cache directory. + base::FilePath cache_path = context->GetPath(); + // If we pass 0 for size, disk_cache will pick a default size using the + // heuristics based on available disk size. These are implemented in + // disk_cache::PreferredCacheSize in net/disk_cache/cache_util.cc. + return content::GeneratedCodeCacheSettings(true, 0, cache_path); +} + void AtomBrowserClient::AllowCertificateError( content::WebContents* web_contents, int cert_error, diff --git a/atom/browser/atom_browser_client.h b/atom/browser/atom_browser_client.h index 20f84a51f79..178780855bf 100644 --- a/atom/browser/atom_browser_client.h +++ b/atom/browser/atom_browser_client.h @@ -91,6 +91,8 @@ class AtomBrowserClient : public content::ContentBrowserClient, void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) override; std::string GetGeolocationApiKey() override; content::QuotaPermissionContext* CreateQuotaPermissionContext() override; + content::GeneratedCodeCacheSettings GetGeneratedCodeCacheSettings( + content::BrowserContext* context) override; void AllowCertificateError( content::WebContents* web_contents, int cert_error, diff --git a/atom/browser/atom_browser_context.cc b/atom/browser/atom_browser_context.cc index 7832255a23a..55f783c1850 100644 --- a/atom/browser/atom_browser_context.cc +++ b/atom/browser/atom_browser_context.cc @@ -191,11 +191,6 @@ base::FilePath AtomBrowserContext::GetPath() const { return path_; } -base::FilePath AtomBrowserContext::GetCachePath() const { - // TODO(deepak1556): Use platform cache directory. - return path_; -} - bool AtomBrowserContext::IsOffTheRecord() const { return in_memory_; } diff --git a/atom/browser/atom_browser_context.h b/atom/browser/atom_browser_context.h index b2a75b31bd5..782d04f2a61 100644 --- a/atom/browser/atom_browser_context.h +++ b/atom/browser/atom_browser_context.h @@ -60,7 +60,6 @@ class AtomBrowserContext // content::BrowserContext: base::FilePath GetPath() const override; - base::FilePath GetCachePath() const override; bool IsOffTheRecord() const override; content::ResourceContext* GetResourceContext() override; std::unique_ptr CreateZoomLevelDelegate(