Let ActivityManager delete the remaining activities on shutdown.

athena/activity/activity_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/activity/public/activity_manager.h"
 
 #include <algorithm>
 #include <vector>
 
+#include "athena/activity/public/activity.h"
 #include "athena/activity/public/activity_view_manager.h"
 #include "base/logging.h"
+#include "base/memory/scoped_vector.h"
+#include "base/stl_util.h"
 
 namespace athena {
 
 namespace {
 
 ActivityManager* instance = NULL;
 
 class ActivityManagerImpl : public ActivityManager {
  public:
   ActivityManagerImpl() {
     CHECK(!instance);
     instance = this;
   }
   virtual ~ActivityManagerImpl() {
+    while (activities_.empty())
+      delete activities_.front();

[sadrul, 2014/06/04 20:34:05]

STLDeleteContainerPointers instead?

[Jun Mukai, 2014/06/04 21:11:14]

RemoveActivity changes the contents of |activities_| and
STLDeleteContainerPointers is going mad about that.

+
     CHECK_EQ(this, instance);
     instance = NULL;
   }
 
   // ActivityManager:
   virtual void AddActivity(Activity* activity) OVERRIDE {
     CHECK(activities_.end() == std::find(activities_.begin(),
                                          activities_.end(),
                                          activity));
     activities_.push_back(activity);
@@ skipping 34 matching lines @@
   ActivityViewManager::Create();
 
   return instance;
 }
 
 ActivityManager* ActivityManager::Get() {
   return instance;
 }
 
 void ActivityManager::Shutdown() {
-  ActivityViewManager::Shutdown();
-
   CHECK(instance);
   delete instance;
+  ActivityViewManager::Shutdown();

[sadrul, 2014/06/04 20:34:05]

This seems unfortunate.

[Jun Mukai, 2014/06/04 21:11:14]

Because ActivityManager depends on ActivityViewManager, I think this order is
more natural.
Changed the order in Create() for the consistency.

 }
 
 }  // namespace athena