Fix crash which occurs when combining AthenaTestBase tests and other tests

athena/main/athena_launcher.cc

Index: athena/main/athena_launcher.cc
diff --git a/athena/main/athena_launcher.cc b/athena/main/athena_launcher.cc
index d0cd9c1e6331251ebd9a7c1a8b3b3a374f097542..ccf4de9cede7b898d7c57d9ac11c63c81ec26641 100644
--- a/athena/main/athena_launcher.cc
+++ b/athena/main/athena_launcher.cc
@@ -100,7 +100,7 @@ void StartAthenaEnv(scoped_refptr<base::TaskRunner> blocking_task_runner) {
   ui::TouchFactory::SetTouchDeviceListFromCommandLine();
 #endif
 
-  views::ViewsDelegate::views_delegate = new AthenaViewsDelegate();
+  CreateAthenaViewsDelegate();
 
   AthenaEnvState* env_state = new AthenaEnvState;
 
@@ -165,7 +165,7 @@ void ShutdownAthena() {
   athena::ExtensionsDelegate::Shutdown();
   athena::AthenaEnv::Shutdown();
 
-  delete views::ViewsDelegate::views_delegate;
+  ShutdownAthenaViewsDelegate();
 }
 
 }  // namespace athena