Revert of Fix flaky remoting webapp javascript unittest.

chrome/test/remoting/webapp_javascript_unittest.cc

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 f3a7ff718b9249608ddd08473ccb8c009615c6ce..676daa9f155dd1c5a9811937b94a6b0e94dc4bc3 100644
--- a/chrome/test/remoting/webapp_javascript_unittest.cc
+++ b/chrome/test/remoting/webapp_javascript_unittest.cc
@@ -12,8 +12,15 @@
 
 namespace remoting {
 
+// 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
+#endif
 IN_PROC_BROWSER_TEST_F(QUnitBrowserTestRunner,
-                       Remoting_Webapp_Js_Unittest) {
+                       MAYBE_Remoting_Webapp_Js_Unittest) {
   base::FilePath base_dir;
   ASSERT_TRUE(PathService::Get(base::DIR_EXE, &base_dir));