Fix crash which occurs when combining AthenaTestBase tests and other tests

athena/main/athena_launcher.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/main/public/athena_launcher.h"
 
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/content/public/app_registry.h"
 #include "athena/content/public/content_activity_factory_creator.h"
@@ skipping 82 matching lines @@
   command_line->AppendSwitch(app_list::switches::kEnableExperimentalAppList);
   command_line->AppendSwitch(switches::kEnableOverlayScrollbar);
 
   // Enable vertical overscroll.
   command_line->AppendSwitchASCII(switches::kScrollEndEffect, "1");
 
 #if defined(USE_X11)
   ui::TouchFactory::SetTouchDeviceListFromCommandLine();
 #endif
 
   views::ViewsDelegate::views_delegate = new AthenaViewsDelegate();

[oshima, 2014/09/23 17:17:34]

I think it's more consistent to Create/Shutdown static method in
AthenaViewsDelegate and update the views::ViewsDelegate::views_delegate. WDYT?

 
   AthenaEnvState* env_state = new AthenaEnvState;
 
   // Setup VisibilityClient
   env_state->visibility_client.reset(new ::wm::VisibilityController);
   aura::Window* root_window = athena::AthenaEnv::Get()->GetHost()->window();
 
   aura::client::SetVisibilityClient(root_window,
                                     env_state->visibility_client.get());
 
@@ skipping 45 matching lines @@
   }
   athena::AppRegistry::ShutDown();
   athena::WindowManager::Shutdown();
   athena::SystemUI::Shutdown();
   athena::ScreenManager::Shutdown();
   athena::InputManager::Shutdown();
   athena::ExtensionsDelegate::Shutdown();
   athena::AthenaEnv::Shutdown();
 
   delete views::ViewsDelegate::views_delegate;
+  views::ViewsDelegate::views_delegate = NULL;
 }
 
 }  // namespace athena