2 files changed, 12 insertions, 14 deletions
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc
index f5ef96f..89d0e56 100644
--- a/chrome/test/base/in_process_browser_test.cc
+++ b/chrome/test/base/in_process_browser_test.cc
@@ -44,11 +44,6 @@
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
 
-#if defined(USE_AURA)
-#include "ui/aura/root_window.h"
-#include "ui/views/widget/widget.h"
-#endif
-
 namespace {
 
 // Passed as value of kTestType.
@@ -254,14 +249,6 @@ void InProcessBrowserTest::AddBlankTabAndShow(Browser* browser) {
       GURL(chrome::kAboutBlankURL), content::PAGE_TRANSITION_START_PAGE);
   observer.Wait();
 
-#if defined(USE_AURA)
-  // Disable animations on aura, otherwise any code that gets the bounds may get
-  // the wrong thing.
-  views::Widget* widget = views::Widget::GetWidgetForNativeView(
-      browser->window()->GetNativeHandle());
-  widget->SetVisibilityChangedAnimationsEnabled(false);
-#endif
-
   browser->window()->Show();
 }
 
diff --git a/chrome/test/base/test_launcher_utils.cc b/chrome/test/base/test_launcher_utils.cc
index 1560966..d675767 100644
--- a/chrome/test/base/test_launcher_utils.cc
+++ b/chrome/test/base/test_launcher_utils.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -14,6 +14,10 @@
 #include "chrome/common/chrome_switches.h"
 #include "ui/gfx/gl/gl_switches.h"
 
+#if defined(USE_AURA)
+#include "ash/ash_switches.h"
+#endif
+
 namespace test_launcher_utils {
 
 void PrepareBrowserCommandLineForTests(CommandLine* command_line) {
@@ -48,6 +52,13 @@ void PrepareBrowserCommandLineForTests(CommandLine* command_line) {
   // The tests assume that file:// URIs can freely access other file:// URIs.
   command_line->AppendSwitch(switches::kAllowFileAccessFromFiles);
 
+  // TODO(beng): USE_ASH.
+#if defined(USE_AURA)
+  // Disable window animations under aura as the animations effect the
+  // coordinates returned and result in flake.
+  command_line->AppendSwitch(ash::switches::kAuraWindowAnimationsDisabled);
+#endif
+
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
   // Don't use the native password stores on Linux since they may
   // prompt for additional UI during tests and cause test failures or