Delete activity upon window deletion

athena/extensions/shell/extensions_delegate_impl.cc

Index: athena/extensions/shell/extensions_delegate_impl.cc
diff --git a/athena/extensions/extensions_delegate_impl.cc b/athena/extensions/shell/extensions_delegate_impl.cc
similarity index 76%
rename from athena/extensions/extensions_delegate_impl.cc
rename to athena/extensions/shell/extensions_delegate_impl.cc
index dce4fee9ddf36f144a9d0c33097995c4d5e03a89..da3566cca15e2a45bf42caa7bd689cdee600b123 100644
--- a/athena/extensions/extensions_delegate_impl.cc
+++ b/athena/extensions/shell/extensions_delegate_impl.cc
@@ -10,8 +10,6 @@
 namespace athena {
 namespace {
 
-ExtensionsDelegate* instance = NULL;
-
 class ShellExtensionsDelegate : public ExtensionsDelegate {
  public:
   explicit ShellExtensionsDelegate(content::BrowserContext* context)
@@ -45,33 +43,10 @@ class ShellExtensionsDelegate : public ExtensionsDelegate {
 
 }  // namespace
 
-ExtensionsDelegate::ExtensionsDelegate() {
-  DCHECK(!instance);
-  instance = this;
-}
-
-ExtensionsDelegate::~ExtensionsDelegate() {
-  DCHECK(instance);
-  instance = NULL;
-}
-
-// static
-ExtensionsDelegate* ExtensionsDelegate::Get(content::BrowserContext* context) {
-  DCHECK(instance);
-  DCHECK_EQ(context, instance->GetBrowserContext());
-  return instance;
-}
-
 // static
 void ExtensionsDelegate::CreateExtensionsDelegateForShell(
     content::BrowserContext* context) {
   new ShellExtensionsDelegate(context);
 }
 
-// static
-void ExtensionsDelegate::Shutdown() {
-  DCHECK(instance);
-  delete instance;
-}
-
 }  // namespace athena