Let ActivityManager delete the remaining activities on shutdown.

athena/activity/activity_manager_impl.cc

Index: athena/activity/activity_manager_impl.cc
diff --git a/athena/activity/activity_manager_impl.cc b/athena/activity/activity_manager_impl.cc
index ba72f0dea52bf2d10a747921b828d24938b24af7..8e37bcae2dfe996080809e15e54ea5357039cf7f 100644
--- a/athena/activity/activity_manager_impl.cc
+++ b/athena/activity/activity_manager_impl.cc
@@ -7,6 +7,7 @@
 #include <algorithm>
 #include <vector>
 
+#include "athena/activity/public/activity.h"
 #include "athena/activity/public/activity_view_manager.h"
 #include "base/logging.h"
 
@@ -23,6 +24,9 @@ class ActivityManagerImpl : public ActivityManager {
     instance = this;
   }
   virtual ~ActivityManagerImpl() {
+    while (activities_.empty())
+      delete activities_.front();
+
     CHECK_EQ(this, instance);
     instance = NULL;
   }
@@ -64,11 +68,10 @@ class ActivityManagerImpl : public ActivityManager {
 
 // static
 ActivityManager* ActivityManager::Create() {
-  new ActivityManagerImpl();
-  CHECK(instance);
-
   ActivityViewManager::Create();
 
+  new ActivityManagerImpl();
+  CHECK(instance);
   return instance;
 }
 
@@ -77,10 +80,9 @@ ActivityManager* ActivityManager::Get() {
 }
 
 void ActivityManager::Shutdown() {
-  ActivityViewManager::Shutdown();
-
   CHECK(instance);
   delete instance;
+  ActivityViewManager::Shutdown();
 }
 
 }  // namespace athena