Fixing and re-enabling WebRTC/AppRTC integration test.

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 66 matching lines @@
     base::FilePath appengine_dev_appserver =
         GetSourceDir().Append(
             FILE_PATH_LITERAL("../google_appengine/dev_appserver.py"));
     if (!base::PathExists(appengine_dev_appserver)) {
       LOG(ERROR) << "Missing appengine sdk at " <<
           appengine_dev_appserver.value() << ". " << kAdviseOnGclientSolution;
       return false;
     }
 
     base::FilePath apprtc_dir =
-        GetSourceDir().Append(FILE_PATH_LITERAL("out/apprtc"));
+        GetSourceDir().Append(FILE_PATH_LITERAL(
+            "out/webrtc-samples/samples/web/content/apprtc"));
     if (!base::PathExists(apprtc_dir)) {
       LOG(ERROR) << "Missing AppRTC code at " <<
           apprtc_dir.value() << ". " << kAdviseOnGclientSolution;
       return false;
     }
 
     base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
     EXPECT_TRUE(GetPythonCommand(&command_line));
 
     command_line.AppendArgPath(appengine_dev_appserver);
@@ skipping 118 matching lines @@
     firefox_ = base::LaunchProcess(command_line, base::LaunchOptions());
     return firefox_.IsValid();
   }
 
  private:
   base::Process dev_appserver_;
   base::Process firefox_;
   base::Process collider_server_;
 };
 
-IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, DISABLED_MANUAL_WorksOnApprtc) {
+IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest, MANUAL_WorksOnApprtc) {
   // Disabled on Win XP: http://code.google.com/p/webrtc/issues/detail?id=2703.
   if (OnWinXp())
     return;
 
   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 @@
   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 defined(OS_LINUX)
-#define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInteropTest
+#define MAYBE_MANUAL_FirefoxApprtcInteropTest MANUAL_FirefoxApprtcInteropTest
 #else
 // Not implemented yet on Windows and Mac.
 #define MAYBE_MANUAL_FirefoxApprtcInteropTest DISABLED_MANUAL_FirefoxApprtcInteropTest
 #endif
 
 IN_PROC_BROWSER_TEST_F(WebRtcApprtcBrowserTest,
                        MAYBE_MANUAL_FirefoxApprtcInteropTest) {
   // Disabled on Win XP: http://code.google.com/p/webrtc/issues/detail?id=2703.
   if (OnWinXp())
     return;
 
   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"
                        "&firefox_fake_device=1");
   content::WebContents* chrome_tab = OpenPageAndAcceptUserMedia(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));
 }