Revert of Fix flaky remoting webapp javascript unittest.

chrome/test/remoting/webapp_javascript_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/path_service.h"
 #include "build/build_config.h"
 #include "chrome/test/remoting/qunit_browser_test_runner.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/foundation_util.h"
 #endif // !defined(OS_MACOSX)
 
 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));
 
 #if defined(OS_MACOSX)
   if (base::mac::AmIBundled()) {
     // If we are inside a mac bundle, navigate up to the output directory
     base_dir = base::mac::GetAppBundlePath(base_dir).DirName();
   }
 #endif // !defined(OS_MACOSX)
   RunTest(
       base_dir.Append(FILE_PATH_LITERAL("remoting/unittests/unittests.html")));
 }
 
 }  // namespace remoting