Make Mandoline shut down cleanly.

mandoline/ui/browser/browser.cc

 // Copyright 2015 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 "mandoline/ui/browser/browser.h"
 
 #include "base/command_line.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mandoline/ui/browser/browser_ui.h"
 #include "mandoline/ui/browser/merged_service_provider.h"
 #include "mojo/application/application_runner_chromium.h"
 #include "mojo/common/common_type_converters.h"
 #include "third_party/mojo/src/mojo/public/c/system/main.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace mandoline {
 
 Browser::Browser()
     : window_manager_app_(new window_manager::WindowManagerApp(this, this)),
       root_(nullptr),
       content_(nullptr),
       omnibox_(nullptr),
       navigator_host_(this),
       ui_(nullptr) {
   exposed_services_impl_.AddService(this);
 }
 
 Browser::~Browser() {
+  // Destruct ui_ manually while |this| is alive and reset the pointer first.
+  // This is to avoid a double delete when OnViewManagerDisconnected gets
+  // called.
+  delete ui_.release();
 }
 
 void Browser::ReplaceContentWithURL(const mojo::String& url) {
   Embed(url, nullptr, nullptr);
 }
 
 void Browser::Initialize(mojo::ApplicationImpl* app) {
   window_manager_app_->Initialize(app);
   ui_.reset(BrowserUI::Create(this, app));
 
@@ skipping 116 matching lines @@
   if (!omnibox_) {
     omnibox_ = root_->view_manager()->CreateView();
     root_->AddChild(omnibox_);
     omnibox_->SetVisible(true);
     omnibox_->SetBounds(root_->bounds());
   }
   omnibox_->Embed(url, services.Pass(), exposed_services.Pass());
 }
 
 }  // namespace mandoline