mojo: kill app_thread before unloading main app library and add tests

mojo/service_manager/service_manager.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdio.h>
 
 #include "mojo/service_manager/service_manager.h"
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 74 matching lines @@
 
 bool ServiceManager::TestAPI::HasFactoryForURL(const GURL& url) const {
   return manager_->url_to_shell_impl_.find(url) !=
          manager_->url_to_shell_impl_.end();
 }
 
 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 =
       LAZY_INSTANCE_INITIALIZER;
   has_created_instance = true;
   return &instance.Get();
 }
 
 void ServiceManager::ConnectToApplication(const GURL& url,
                                           const GURL& requestor_url,
@@ skipping 38 matching lines @@
 }
 
 ServiceLoader* ServiceManager::GetLoaderForURL(const GURL& url) {
   URLToLoaderMap::const_iterator url_it = url_to_loader_.find(url);
   if (url_it != url_to_loader_.end())
     return url_it->second;
   SchemeToLoaderMap::const_iterator scheme_it =
       scheme_to_loader_.find(url.scheme());
   if (scheme_it != scheme_to_loader_.end())
     return scheme_it->second;
-  DCHECK(default_loader_);
   return default_loader_.get();
 }
 
 void ServiceManager::OnShellImplError(ShellImpl* shell_impl) {
   // Called from ~ShellImpl, so we do not need to call Destroy here.
   const GURL url = shell_impl->url();
   URLToShellImplMap::iterator it = url_to_shell_impl_.find(url);
   DCHECK(it != url_to_shell_impl_.end());
   delete it->second;
   url_to_shell_impl_.erase(it);
   ServiceLoader* loader = GetLoaderForURL(url);
   if (loader)
     loader->OnServiceError(this, url);
 }
 
 ScopedMessagePipeHandle ServiceManager::ConnectToServiceByName(
       const GURL& application_url,
       const std::string& interface_name) {
   StubServiceProvider* stub_sp = new StubServiceProvider;
   ServiceProviderPtr spp;
   BindToProxy(stub_sp, &spp);
   ConnectToApplication(GURL(application_url), GURL(), spp.Pass());
   MessagePipe pipe;
   stub_sp->GetRemoteServiceProvider()->ConnectToService(
       interface_name, pipe.handle1.Pass());
   return pipe.handle0.Pass();
 }
 }  // namespace mojo