summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-27 05:27:41 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-27 05:27:41 +0000
commit47f782c2f1e3c1f3c95e345494b6f5a1a670fd21 (patch)
tree9d29edfe22bced14f5473934f3097e5d259ea9db /chrome/browser
parentea9058d410a6df42e3ed72e0414fcf4b3607c3cb (diff)
downloadchromium_src-47f782c2f1e3c1f3c95e345494b6f5a1a670fd21.zip
chromium_src-47f782c2f1e3c1f3c95e345494b6f5a1a670fd21.tar.gz
chromium_src-47f782c2f1e3c1f3c95e345494b6f5a1a670fd21.tar.bz2
Attempt to make interactive ui tests complete on Linux while I try to repro it.
Review URL: http://codereview.chromium.org/333042 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/browser_focus_uitest.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index 7a07b1e..f0b0a54 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -332,6 +332,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_TabsRememberFocusFindInPage) {
}
// Background window does not steal focus.
+#if !defined(OS_LINUX)
IN_PROC_BROWSER_TEST_F(BrowserFocusTest, BackgroundBrowserDontStealFocus) {
HTTPTestServer* server = StartHTTPServer();
@@ -379,6 +380,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, BackgroundBrowserDontStealFocus) {
// Close the 2nd browser to avoid a DCHECK().
browser2->window()->Close();
}
+#endif
// Page cannot steal focus when focus is on location bar.
IN_PROC_BROWSER_TEST_F(BrowserFocusTest, LocationBarLockFocus) {