Bring skydebugger closer to clean-shutdown

sky/tools/debugger/debugger.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 "sky/tools/debugger/debugger.h"
 
 namespace sky {
 namespace debugger {
 
 SkyDebugger::SkyDebugger()
@@ skipping 48 matching lines @@
   root_->AddChild(content_);
 
   window_manager_app_->InitFocus(
       new FocusRules(window_manager_app_.get(), content_));
 
   if (!pending_url_.empty())
     NavigateToURL(pending_url_);
 }
 
 void SkyDebugger::OnViewManagerDisconnected(mojo::ViewManager* view_manager) {
-  CHECK(false); // FIXME: This is dead code, why?
   view_manager_ = nullptr;
   root_ = nullptr;
 }
 
 void SkyDebugger::OnViewDestroyed(mojo::View* view) {
-  CHECK(false); // FIXME: This is dead code, why?
   view->RemoveObserver(this);
 }
 
 void SkyDebugger::OnViewBoundsChanged(mojo::View* view,
                                       const mojo::Rect& old_bounds,
                                       const mojo::Rect& new_bounds) {
   content_->SetBounds(new_bounds);
 }
 
 void SkyDebugger::Create(mojo::ApplicationConnection* connection,
                          mojo::InterfaceRequest<Debugger> request) {
   mojo::WeakBindToRequest(this, &request);
 }
 
 void SkyDebugger::NavigateToURL(const mojo::String& url) {
   // We can get Navigate commands before we've actually been
   // embedded into the view and content_ created.
   // Just save the last one.
   if (content_) {
     scoped_ptr<mojo::ServiceProviderImpl> exported_services(
       new mojo::ServiceProviderImpl());
     exported_services->AddService(&navigator_host_factory_);
     viewer_services_ = content_->Embed(url, exported_services.Pass());
   } else {
     pending_url_ = url;
   }
 }
 
+void SkyDebugger::Shutdown() {
+  // Make sure we shut down mojo before quitting the message loop or things
+  // like blink::shutdown() may try to talk to the message loop and crash.
+  window_manager_app_.reset();
+
+  // TODO(eseidel): This still hits an X11 error which I don't understand
+  // "X Error of failed request:  GLXBadDrawable", crbug.com/430581
+  mojo::ApplicationImpl::Terminate();
+}
+
 void SkyDebugger::InjectInspector() {
   InspectorServicePtr inspector_service;
   mojo::ConnectToService(viewer_services_.get(), &inspector_service);
   inspector_service->Inject();
 }
 
 }  // namespace debugger
 }  // namespace sky