Bring skydebugger closer to clean-shutdown

mojo/services/window_manager/window_manager_app.cc

 // Copyright 2014 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 "mojo/services/window_manager/window_manager_app.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "mojo/aura/aura_init.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
@@ skipping 72 matching lines @@
  public:
   WindowManagerInternalImpl(WindowManagerApp* app) : app_(app) {}
   ~WindowManagerInternalImpl() override {}
 
   // WindowManagerInternal:
   void CreateWindowManagerForViewManagerClient(
       uint16_t connection_id,
       ScopedMessagePipeHandle window_manager_pipe) override {
     // |wm_internal| is tied to the life of the pipe.
     WindowManagerImpl* wm = new WindowManagerImpl(app_, true);
-    BindToPipe(wm, window_manager_pipe.Pass());
+    WeakBindToPipe(wm, window_manager_pipe.Pass());
+  }
+
+  // InterfaceImpl:
+  void OnConnectionError() override {
+    // Necessary since we used WeakBindToPipe and are not automatically deleted.
+    delete this;
   }
 
  private:
   WindowManagerApp* app_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowManagerInternalImpl);
 };
 
 // Used for calls to Embed() that occur before we've connected to the
 // ViewManager.
@@ skipping 11 matching lines @@
     : shell_(nullptr),
       window_manager_factory_(this),
       native_viewport_event_dispatcher_factory_(this),
       wrapped_view_manager_delegate_(view_manager_delegate),
       window_manager_delegate_(window_manager_delegate),
       view_manager_(NULL),
       root_(NULL),
       dummy_delegate_(new DummyDelegate) {
 }
 
-WindowManagerApp::~WindowManagerApp() {}
+WindowManagerApp::~WindowManagerApp() {
+  STLDeleteElements(&connections_);
+}
 
 // static
 View* WindowManagerApp::GetViewForWindow(aura::Window* window) {
   return window->GetProperty(kViewKey);
 }
 
 aura::Window* WindowManagerApp::GetWindowForViewId(Id view) {
   ViewIdToWindowMap::const_iterator it = view_id_to_window_map_.find(view);
   return it != view_id_to_window_map_.end() ? it->second : NULL;
 }
@@ skipping 268 matching lines @@
   view_manager_app->ConnectToService(&window_manager_client_);
 }
 
 void WindowManagerApp::Create(ApplicationConnection* connection,
                               InterfaceRequest<WindowManagerInternal> request) {
   WindowManagerInternalImpl* impl = new WindowManagerInternalImpl(this);
   BindToRequest(impl, &request);
 }
 
 }  // namespace mojo