Reland Window Control Animations for TouchView

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc

Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
index 790cf9e0e2d858cbda9576c16c1dc58105155442..49114039e8651169c95232a156f56ea73b2ba462 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash_browsertest.cc
@@ -25,7 +25,34 @@
 
 using views::Widget;
 
-typedef InProcessBrowserTest BrowserNonClientFrameViewAshTest;
+namespace {
+
+class BrowserNonClientFrameViewAshTest : public InProcessBrowserTest {
+ public:
+  BrowserNonClientFrameViewAshTest() {}
+  virtual ~BrowserNonClientFrameViewAshTest() {}
+
+  // InProcessBrowserTest:
+  virtual void SetUp() OVERRIDE;
+  virtual void TearDown() OVERRIDE;
+
+ private:
+  scoped_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_;
+  DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAshTest);
+};
+
+void BrowserNonClientFrameViewAshTest::SetUp() {
+  zero_duration_mode_.reset(new ui::ScopedAnimationDurationScaleMode(
+      ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
+  InProcessBrowserTest::SetUp();
+}
+
+void BrowserNonClientFrameViewAshTest::TearDown() {
+  zero_duration_mode_.reset();
+  InProcessBrowserTest::TearDown();
+}
+
+}  // namespace
 
 IN_PROC_BROWSER_TEST_F(BrowserNonClientFrameViewAshTest, NonClientHitTest) {
   BrowserView* browser_view = BrowserView::GetBrowserViewForBrowser(browser());