Animate the OverviewButtonTray

ash/system/tray/system_tray_unittest.cc

Index: ash/system/tray/system_tray_unittest.cc
diff --git a/ash/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc
index 1a2d3555e81a2b88eb536d156c22526f8079992b..e7eb64077788e93749e8ad1dcc1d145467fb5dd1 100644
--- a/ash/system/tray/system_tray_unittest.cc
+++ b/ash/system/tray/system_tray_unittest.cc
@@ -13,6 +13,7 @@
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_item.h"
+#include "ash/system/tray/tray_background_view.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
@@ -33,7 +34,6 @@
 #endif
 
 namespace ash {
-namespace test {
 
 namespace {
 
@@ -156,7 +156,19 @@ class ModalWidgetDelegate : public views::WidgetDelegateView {
 
 }  // namespace
 
-typedef AshTestBase SystemTrayTest;
+class SystemTrayTest : public test::AshTestBase {
+ public:
+  SystemTrayTest() {}
+  virtual ~SystemTrayTest() {}
+
+  virtual void SetUp() OVERRIDE {
+    TrayBackgroundView::DisableAnimationsForTest();
+    test::AshTestBase::SetUp();
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(SystemTrayTest);
+};
 
 TEST_F(SystemTrayTest, SystemTrayDefaultView) {
   SystemTray* tray = GetSystemTray();
@@ -483,5 +495,4 @@ TEST_F(SystemTrayTest, MAYBE_WithSystemModal) {
   EXPECT_TRUE(settings->visible());
 }
 
-}  // namespace test
 }  // namespace ash