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 2dfa8fc0e4aad16a4faff4da0c5f15b1cd9b12d6..44be0d7c499e0f843e8d8677430921c83f659aea 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 |
@@ -24,7 +24,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()); |