| Index: mojo/shell/context.cc
|
| diff --git a/mojo/shell/context.cc b/mojo/shell/context.cc
|
| index 0810a17a6bf0787131c296fb23d43e240994311f..1f2eb8b9c61458e7a774aa73558f609d1281fbeb 100644
|
| --- a/mojo/shell/context.cc
|
| +++ b/mojo/shell/context.cc
|
| @@ -153,7 +153,7 @@ void Context::Init() {
|
| #endif
|
| }
|
|
|
| -void Context::Shutdown() {
|
| +Context::~Context() {
|
| // mojo_view_manager uses native_viewport. Destroy mojo_view_manager first so
|
| // that there aren't shutdown ordering issues. Once native viewport service is
|
| // moved into its own process this can likely be nuked.
|
| @@ -163,11 +163,6 @@ void Context::Shutdown() {
|
| GURL("mojo:mojo_view_manager"));
|
| #endif
|
| service_manager_.set_default_loader(scoped_ptr<ServiceLoader>());
|
| - service_manager_.TerminateShellConnections();
|
| -}
|
| -
|
| -Context::~Context() {
|
| - Shutdown();
|
| }
|
|
|
| } // namespace shell
|
|
|