content/browser/service_worker/service_worker_context_core.cc - Issue 633873002: Service Worker: Respect the "clear on exit" content setting

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/service_worker/service_worker_context_core.cc

Issue 633873002: Service Worker: Respect the "clear on exit" content setting (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@contentsettings

Patch Set: self review Created 6 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/service_worker/service_worker_context_core.h ('k') | content/browser/service_worker/service_worker_context_wrapper.h » ('j') | content/browser/service_worker/service_worker_database_task_manager.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_context_core.cc

diff --git a/content/browser/service_worker/service_worker_context_core.cc b/content/browser/service_worker/service_worker_context_core.cc

index a5abf968b70cd1ccec54445659d6c09802916e8c..8fba30aef27bead61ba925e228bd7dfc1c9ed2d3 100644

--- a/content/browser/service_worker/service_worker_context_core.cc

+++ b/content/browser/service_worker/service_worker_context_core.cc

@@ -11,6 +11,7 @@

#include "content/browser/service_worker/service_worker_cache_storage_manager.h"

#include "content/browser/service_worker/service_worker_context_observer.h"

#include "content/browser/service_worker/service_worker_context_wrapper.h"

+#include "content/browser/service_worker/service_worker_database_task_manager.h"

#include "content/browser/service_worker/service_worker_info.h"

#include "content/browser/service_worker/service_worker_job_coordinator.h"

#include "content/browser/service_worker/service_worker_process_manager.h"

@@ -84,9 +85,10 @@ void ServiceWorkerContextCore::ProviderHostIterator::Initialize() {

ServiceWorkerContextCore::ServiceWorkerContextCore(

const base::FilePath& path,

const scoped_refptr<base::SequencedTaskRunner>& cache_task_runner,

- const scoped_refptr<base::SequencedTaskRunner>& database_task_runner,

+ scoped_ptr<ServiceWorkerDatabaseTaskManager> database_task_manager,

const scoped_refptr<base::SingleThreadTaskRunner>& disk_cache_thread,

storage::QuotaManagerProxy* quota_manager_proxy,

+ storage::SpecialStoragePolicy* special_storage_policy,

ObserverListThreadSafe<ServiceWorkerContextObserver>* observer_list,

ServiceWorkerContextWrapper* wrapper)

: weak_factory_(this),

@@ -94,9 +96,10 @@ ServiceWorkerContextCore::ServiceWorkerContextCore(

providers_(new ProcessToProviderMap),

storage_(ServiceWorkerStorage::Create(path,

AsWeakPtr(),

- database_task_runner,

+ database_task_manager.Pass(),

disk_cache_thread,

- quota_manager_proxy)),

+ quota_manager_proxy,

+ special_storage_policy)),

cache_manager_(

ServiceWorkerCacheStorageManager::Create(path,

cache_task_runner.get())),