Revert of Disabling AppRTC browser test until I can take a closer look.

chrome/browser/media/chrome_webrtc_apprtc_browsertest.cc

 // Copyright 2013 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/command_line.h"
 #include "base/files/file_enumerator.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/rand_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 211 matching lines @@
     firefox_ = base::LaunchProcess(command_line, base::LaunchOptions());
     return firefox_.IsValid();
   }
 
  private:
   base::Process dev_appserver_;
   base::Process firefox_;
   base::Process collider_server_;
 };
 
-// Broken because of dependency updates: http://crbug.com/581283.
-IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest,
-                       DISABLED_MANUAL_WorksOnApprtc) {
+IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, MANUAL_WorksOnApprtc) {
   DetectErrorsInJavaScript();
   ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999"));
   ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089"));
   while (!LocalApprtcInstanceIsUp())
     DVLOG(1) << "Waiting for AppRTC to come up...";
 
   GURL room_url = GURL("http://localhost:9999/r/some_room"
                        "?wshpp=localhost:8089&wstls=false");
 
   // Set up the left tab.
@@ skipping 19 matching lines @@
   ASSERT_TRUE(WaitForCallToComeUp(left_tab));
   ASSERT_TRUE(WaitForCallToComeUp(right_tab));
 
   ASSERT_TRUE(DetectRemoteVideoPlaying(left_tab));
   ASSERT_TRUE(DetectRemoteVideoPlaying(right_tab));
 
   chrome::CloseWebContents(browser(), left_tab, false);
   chrome::CloseWebContents(browser(), right_tab, false);
 }
 
-#if 0
+#if defined(OS_LINUX)
 #define MAYBE_MANUAL_FirefoxApprtcInteropTest MANUAL_FirefoxApprtcInteropTest
 #else
 // Not implemented yet on Windows and Mac.
-// Broken because of dependency updates: http://crbug.com/581283.
 #define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInteropTest
 #endif
 
 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest,
                        MAYBE_MANUAL_FirefoxApprtcInteropTest) {
   DetectErrorsInJavaScript();
   ASSERT_TRUE(LaunchApprtcInstanceOnLocalhost("9999"));
   ASSERT_TRUE(LaunchColliderOnLocalHost("http://localhost:9999", "8089"));
   while (!LocalApprtcInstanceIsUp())
     DVLOG(1) << "Waiting for AppRTC to come up...";
@@ skipping 10 matching lines @@
       InfoBarService::FromWebContents(chrome_tab), InfoBarResponder::ACCEPT);
   ui_test_utils::NavigateToURL(browser(), room_url);
 
   ASSERT_TRUE(LaunchFirefoxWithUrl(room_url));
 
   ASSERT_TRUE(WaitForCallToComeUp(chrome_tab));
 
   // Ensure Firefox manages to send video our way.
   ASSERT_TRUE(DetectRemoteVideoPlaying(chrome_tab));
 }