| Index: chrome/test/remoting/webapp_javascript_unittest.cc
|
| diff --git a/chrome/test/remoting/webapp_javascript_unittest.cc b/chrome/test/remoting/webapp_javascript_unittest.cc
|
| index 017a1396f9aa0cfe55cec504bfdf80f0337cec5c..676daa9f155dd1c5a9811937b94a6b0e94dc4bc3 100644
|
| --- a/chrome/test/remoting/webapp_javascript_unittest.cc
|
| +++ b/chrome/test/remoting/webapp_javascript_unittest.cc
|
| @@ -12,8 +12,9 @@
|
|
|
| namespace remoting {
|
|
|
| -// Flakily times out on Win7 Tests (dbg): https://crbug.com/504204.
|
| -#if defined(OS_WIN) && !defined(NDEBUG)
|
| +// Flakily times out on Win7 Tests (dbg) and Linux Tests (dbg)(1):
|
| +// https://crbug.com/504204.
|
| +#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(NDEBUG)
|
| #define MAYBE_Remoting_Webapp_Js_Unittest DISABLED_Remoting_Webapp_Js_Unittest
|
| #else
|
| #define MAYBE_Remoting_Webapp_Js_Unittest Remoting_Webapp_Js_Unittest
|
|
|