| Index: mojo/service_manager/service_manager.cc
|
| diff --git a/mojo/service_manager/service_manager.cc b/mojo/service_manager/service_manager.cc
|
| index 65a93bdf68d03074b45ba64151f52cb4cfe3ea75..ea6c1a703b42020184e261b002e92f42bcb1bcc0 100644
|
| --- a/mojo/service_manager/service_manager.cc
|
| +++ b/mojo/service_manager/service_manager.cc
|
| @@ -92,11 +92,15 @@ ServiceManager::ServiceManager() : interceptor_(NULL) {
|
| }
|
|
|
| ServiceManager::~ServiceManager() {
|
| - STLDeleteValues(&url_to_shell_impl_);
|
| + DCHECK(url_to_shell_impl_.empty());
|
| 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 =
|
| @@ -155,7 +159,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();
|
| }
|
|
|
|
|