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

Unified Diff: mojo/service_manager/service_manager.cc

Issue 397733003: mojo: kill app_thread before unloading main app library and add tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: also service_manager_unittests Created 6 years, 5 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 | « mojo/service_manager/service_manager.h ('k') | mojo/shell/context.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/service_manager/service_manager.cc
diff --git a/mojo/service_manager/service_manager.cc b/mojo/service_manager/service_manager.cc
index 92d336ca5b788694aa93a17f1d6f005b9580491b..0f13cfde6b375231d69db0fdd336a8d5a1f18788 100644
--- a/mojo/service_manager/service_manager.cc
+++ b/mojo/service_manager/service_manager.cc
@@ -94,11 +94,15 @@ ServiceManager::ServiceManager() : interceptor_(NULL) {
}
ServiceManager::~ServiceManager() {
- STLDeleteValues(&url_to_shell_impl_);
+ TerminateShellConnections();
STLDeleteValues(&url_to_loader_);
STLDeleteValues(&scheme_to_loader_);
}
+void ServiceManager::TerminateShellConnections() {
+ STLDeleteValues(&url_to_shell_impl_);
+}
+
// static
ServiceManager* ServiceManager::GetInstance() {
static base::LazyInstance<ServiceManager> instance =
@@ -157,7 +161,6 @@ ServiceLoader* ServiceManager::GetLoaderForURL(const GURL& url) {
scheme_to_loader_.find(url.scheme());
if (scheme_it != scheme_to_loader_.end())
return scheme_it->second;
- DCHECK(default_loader_);
return default_loader_.get();
}
« no previous file with comments | « mojo/service_manager/service_manager.h ('k') | mojo/shell/context.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698