summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_focus_uitest.cc
diff options
context:
space:
mode:
authorzork@google.com <zork@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-08 20:58:16 +0000
committerzork@google.com <zork@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-08 20:58:16 +0000
commit9ab71d1832cb2651d60769aa263f5fc086a0b6be (patch)
tree0d27c2ed8f24f6d3e593bc5da6bb5353cfa19971 /chrome/browser/browser_focus_uitest.cc
parentb3ac5c830a92eecabb94160169e72415d59a5509 (diff)
downloadchromium_src-9ab71d1832cb2651d60769aa263f5fc086a0b6be.zip
chromium_src-9ab71d1832cb2651d60769aa263f5fc086a0b6be.tar.gz
chromium_src-9ab71d1832cb2651d60769aa263f5fc086a0b6be.tar.bz2
Disable BrowserFocusTest.BrowsersRememberFocus as it is crashing the
interactive UI tests in win. BUG=none TEST=none Review URL: http://codereview.chromium.org/270029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_focus_uitest.cc')
-rw-r--r--chrome/browser/browser_focus_uitest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index df25ba4..01b49a9 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -245,7 +245,13 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_ClickingMovesFocus) {
CheckViewHasFocus(VIEW_ID_LOCATION_BAR);
}
-IN_PROC_BROWSER_TEST_F(BrowserFocusTest, BrowsersRememberFocus) {
+#if defined(OS_WIN)
+#define MAYBE_BrowsersRememberFocus DISABLED_BrowsersRememberFocus
+#else
+#define MAYBE_BrowsersRememberFocus BrowsersRememberFocus
+#endif // defined(OS_WIN)
+
+IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_BrowsersRememberFocus) {
HTTPTestServer* server = StartHTTPServer();
// First we navigate to our test page.