Fix crash which occurs when combining AthenaTestBase tests and other tests

athena/main/athena_views_delegate.h

Index: athena/main/athena_views_delegate.h
diff --git a/athena/main/athena_views_delegate.h b/athena/main/athena_views_delegate.h
index b5d858623d760e5584a0636c03c84acd519f291b..914351aa2d5ca600c58ae74175825fc639f72cf1 100644
--- a/athena/main/athena_views_delegate.h
+++ b/athena/main/athena_views_delegate.h
@@ -4,24 +4,18 @@
 #ifndef ATHENA_MAIN_ATHENA_VIEWS_DELEGATE_H_
 #define ATHENA_MAIN_ATHENA_VIEWS_DELEGATE_H_
 
-#include "ui/views/views_delegate.h"
+namespace views {
+class ViewsDelegate;
+}
 
 namespace athena {
 
-class AthenaViewsDelegate : public views::ViewsDelegate {
+class AthenaViewsDelegate {
  public:
-  AthenaViewsDelegate() {}
-  virtual ~AthenaViewsDelegate() {}
-
- private:
-  // views::ViewsDelegate:
-  virtual void OnBeforeWidgetInit(
-      views::Widget::InitParams* params,
-      views::internal::NativeWidgetDelegate* delegate) OVERRIDE;
-  virtual views::NonClientFrameView* CreateDefaultNonClientFrameView(
-      views::Widget* widget) OVERRIDE;
+  static views::ViewsDelegate* Create();

[oshima, 2014/09/23 20:35:53]

You don't have to return the instance, do you?

+  static void Shutdown();
 
-  DISALLOW_COPY_AND_ASSIGN(AthenaViewsDelegate);
+  virtual ~AthenaViewsDelegate() {}
 };
 
 }  // namespace athena