diff options
| author | Erik Arvidsson <arv@chromium.org> | 2014-09-03 15:47:57 -0400 |
|---|---|---|
| committer | Erik Arvidsson <arv@chromium.org> | 2014-09-03 19:52:15 +0000 |
| commit | 04dbb3ca4b5cddd6460ecca8df727e5114977d08 (patch) | |
| tree | 9742382ce2554342641157b5435f62d196fc3b4b | |
| parent | 3ad5b6c7be2b0f19740f22c2c01a9562d39fa914 (diff) | |
| download | chromium_src-04dbb3ca4b5cddd6460ecca8df727e5114977d08.zip chromium_src-04dbb3ca4b5cddd6460ecca8df727e5114977d08.tar.gz chromium_src-04dbb3ca4b5cddd6460ecca8df727e5114977d08.tar.bz2 | |
Disable TestUndockedDevToolsUnresponsive.TestUndockedDevToolsUnresponsive
Last commit (#293147) got the boolean logic wrong.
BUG=410327
TBR=tkent,rvargas
Review URL: https://codereview.chromium.org/541443002
Cr-Commit-Position: refs/heads/master@{#293186}
| -rw-r--r-- | chrome/browser/devtools/devtools_sanity_browsertest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/devtools/devtools_sanity_browsertest.cc b/chrome/browser/devtools/devtools_sanity_browsertest.cc index 5ede515..4b169ce 100644 --- a/chrome/browser/devtools/devtools_sanity_browsertest.cc +++ b/chrome/browser/devtools/devtools_sanity_browsertest.cc @@ -573,7 +573,7 @@ IN_PROC_BROWSER_TEST_F(DevToolsBeforeUnloadTest, // Times out on Win and Linux // @see http://crbug.com/410327 -#if defined(OS_WIN) && defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_WIN) || (defined(OS_LINUX) && !defined(OS_CHROMEOS)) #define MAYBE_TestUndockedDevToolsUnresponsive DISABLED_TestUndockedDevToolsUnresponsive #else #define MAYBE_TestUndockedDevToolsUnresponsive TestUndockedDevToolsUnresponsive |