summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_focus_uitest.cc
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 23:50:42 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-06 23:50:42 +0000
commit8244fafba0c441b0a76cd4679f23ade2c7c8e208 (patch)
treeed9983035452799f25d93d40ab91d9668dd0cbee /chrome/browser/browser_focus_uitest.cc
parent706197adc80edd1b1b73a6eea38a5b080609b103 (diff)
downloadchromium_src-8244fafba0c441b0a76cd4679f23ade2c7c8e208.zip
chromium_src-8244fafba0c441b0a76cd4679f23ade2c7c8e208.tar.gz
chromium_src-8244fafba0c441b0a76cd4679f23ade2c7c8e208.tar.bz2
Relanding the CL that made interactive UI tests run out-of-proc.
It was causing them to hang on Windows. I cannot repro on my box. I added a timeout to the ViewEventTest as I suspect they are the ones causing the timeout. Original review: http://codereview.chromium.org/355014/show TEST=None TBR=rafael Review URL: http://codereview.chromium.org/360016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31327 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_focus_uitest.cc')
-rw-r--r--chrome/browser/browser_focus_uitest.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/browser_focus_uitest.cc b/chrome/browser/browser_focus_uitest.cc
index f0b0a54..7a07b1e 100644
--- a/chrome/browser/browser_focus_uitest.cc
+++ b/chrome/browser/browser_focus_uitest.cc
@@ -332,7 +332,6 @@ 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();
@@ -380,7 +379,6 @@ 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) {