Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(423)

Unified Diff: chrome/browser/browser_process_impl.cc

Issue 305723003: Shut down the ServiceWorker system as the browser's shutting down. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove a redundant clear() Created 6 years, 7 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 | « no previous file | chrome/browser/chrome_service_worker_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/browser_process_impl.cc
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index a4e35338f5b4770b9061a90354a08db991f6c901..2ea7e751f1dbd7a1a66c56c674264b7fa801af15 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -86,6 +86,8 @@
#include "content/public/browser/plugin_service.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/resource_dispatcher_host.h"
+#include "content/public/browser/service_worker_context.h"
+#include "content/public/browser/storage_partition.h"
#include "extensions/common/constants.h"
#include "extensions/common/extension_l10n_util.h"
#include "net/socket/client_socket_pool_manager.h"
@@ -325,6 +327,10 @@ unsigned int BrowserProcessImpl::AddRefModule() {
return module_ref_count_;
}
+static void ShutdownServiceWorkerContext(content::StoragePartition* partition) {
+ partition->GetServiceWorkerContext()->Terminate();
+}
+
unsigned int BrowserProcessImpl::ReleaseModule() {
DCHECK(CalledOnValidThread());
DCHECK_NE(0u, module_ref_count_);
@@ -332,6 +338,14 @@ unsigned int BrowserProcessImpl::ReleaseModule() {
if (0 == module_ref_count_) {
release_last_reference_callstack_ = base::debug::StackTrace();
+ // Stop service workers
+ ProfileManager* pm = profile_manager();
+ std::vector<Profile*> profiles(pm->GetLoadedProfiles());
+ for (size_t i = 0; i < profiles.size(); ++i) {
+ content::BrowserContext::ForEachStoragePartition(
+ profiles[i], base::Bind(ShutdownServiceWorkerContext));
+ }
+
#if defined(ENABLE_PRINTING)
// Wait for the pending print jobs to finish. Don't do this later, since
// this might cause a nested message loop to run, and we don't want pending
« no previous file with comments | « no previous file | chrome/browser/chrome_service_worker_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698