athena: Fix a use-after-free case.

athena/wm/window_manager_impl.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 "athena/wm/public/window_manager.h"
 
 #include <algorithm>
 
 #include "athena/common/container_priorities.h"
 #include "athena/input/public/accelerator_manager.h"
@@ skipping 117 matching lines @@
   wm_state_.reset(new wm::WMState());
   aura::client::ActivationClient* activation_client =
       aura::client::GetActivationClient(container_->GetRootWindow());
   shadow_controller_.reset(new wm::ShadowController(activation_client));
   instance = this;
   InstallAccelerators();
 }
 
 WindowManagerImpl::~WindowManagerImpl() {
   overview_.reset();
+  split_view_controller_.reset();

[mfomitchev, 2014/08/14 13:10:02]

Ugh. Thanks. Sorry, I should've done the Asan build myself.
Should we destroy the bezel_controller_ explicitly here as well since it holds a
raw pointer to container_ and to split_view_controller?

   mru_window_tracker_.reset();
   if (container_) {
     container_->RemoveObserver(this);
     container_->RemovePreTargetHandler(bezel_controller_.get());
   }
   // |title_drag_controller_| needs to be reset before |container_|.
   title_drag_controller_.reset();
   container_.reset();
   instance = NULL;
 }
@@ skipping 168 matching lines @@
   DCHECK(!instance);
 }
 
 // static
 WindowManager* WindowManager::GetInstance() {
   DCHECK(instance);
   return instance;
 }
 
 }  // namespace athena