Working around the page load problem on Linux, re-enable tests.

chrome/browser/media/chrome_webrtc_video_quality_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/environment.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/strings/string_split.h"
 #include "base/strings/stringprintf.h"
@@ skipping 12 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/ui/ui_test.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/python_utils.h"
 #include "testing/perf/perf_test.h"
 
-// Temporarily disabled on Linux.
-// http://crbug.com/281268.
-#if defined(OS_LINUX)
-#define MAYBE_WebrtcVideoQualityBrowserTest DISABLED_WebrtcVideoQualityBrowserTest
-#else
-#define MAYBE_WebrtcVideoQualityBrowserTest WebrtcVideoQualityBrowserTest
-#endif
-
 static const base::FilePath::CharType kFrameAnalyzerExecutable[] =
 #if defined(OS_WIN)
     FILE_PATH_LITERAL("frame_analyzer.exe");
 #else
     FILE_PATH_LITERAL("frame_analyzer");
 #endif
 
 static const base::FilePath::CharType kArgbToI420ConverterExecutable[] =
 #if defined(OS_WIN)
     FILE_PATH_LITERAL("rgba_to_i420_converter.exe");
@@ skipping 42 matching lines @@
 // * zxing (see the CPP version at https://code.google.com/p/zxing)
 // * ffmpeg 0.11.1 or compatible version (see http://www.ffmpeg.org)
 //
 // The test case will launch a custom binary (peerconnection_server) which will
 // allow two WebRTC clients to find each other.
 //
 // The test also runs several other custom binaries - rgba_to_i420 converter and
 // frame_analyzer. Both tools can be found under third_party/webrtc/tools. The
 // test also runs a stand alone Python implementation of a WebSocket server
 // (pywebsocket) and a barcode_decoder script.
-class MAYBE_WebrtcVideoQualityBrowserTest : public WebRtcTestBase {
+class WebrtcVideoQualityBrowserTest : public WebRtcTestBase {
  public:
-  MAYBE_WebrtcVideoQualityBrowserTest()
+  WebrtcVideoQualityBrowserTest()
       : pywebsocket_server_(0),
         environment_(base::Environment::Create()) {}
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
     PeerConnectionServerRunner::KillAllPeerConnectionServersOnCurrentSystem();
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     // This test expects real device handling and requires a real webcam / audio
     // device; it will not work with fake devices.
@@ skipping 208 matching lines @@
   base::FilePath GetBrowserDir() {
     base::FilePath browser_dir;
     EXPECT_TRUE(PathService::Get(base::DIR_MODULE, &browser_dir));
     return browser_dir;
   }
 
   base::ProcessHandle pywebsocket_server_;
   scoped_ptr<base::Environment> environment_;
 };
 
-IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcVideoQualityBrowserTest,
+IN_PROC_BROWSER_TEST_F(WebrtcVideoQualityBrowserTest,
                        MANUAL_TestVGAVideoQuality) {
   ASSERT_TRUE(HasAllRequiredResources());
   ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
   ASSERT_TRUE(StartPyWebSocketServer());
   ASSERT_TRUE(peerconnection_server_.Start());
 
-  ui_test_utils::NavigateToURL(
-      browser(), embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage));
   content::WebContents* left_tab =
-      browser()->tab_strip_model()->GetActiveWebContents();
-  GetUserMediaAndAccept(left_tab);
-
-  chrome::AddTabAt(browser(), GURL(), -1, true);
+      OpenPageAndGetUserMediaInNewTab(
+          embedded_test_server()->GetURL(kMainWebrtcTestHtmlPage));
   content::WebContents* right_tab =
-      browser()->tab_strip_model()->GetActiveWebContents();
-  ui_test_utils::NavigateToURL(
-      browser(), embedded_test_server()->GetURL(kCapturingWebrtcHtmlPage));
-  GetUserMediaAndAccept(right_tab);
+      OpenPageAndGetUserMediaInNewTab(
+          embedded_test_server()->GetURL(kCapturingWebrtcHtmlPage));
 
   ConnectToPeerConnectionServer("peer 1", left_tab);
   ConnectToPeerConnectionServer("peer 2", right_tab);
 
   EstablishCall(left_tab, right_tab);
 
   AssertNoAsynchronousErrors(left_tab);
   AssertNoAsynchronousErrors(right_tab);
 
   // Poll slower here to avoid flooding the log with messages: capturing and
@@ skipping 26 matching lines @@
 
   RunARGBtoI420Converter(
       kVgaWidth, kVgaHeight, GetWorkingDir().Append(kCapturedYuvFileName));
   ASSERT_TRUE(
       CompareVideosAndPrintResult(kVgaWidth,
                                   kVgaHeight,
                                   GetWorkingDir().Append(kCapturedYuvFileName),
                                   GetWorkingDir().Append(kReferenceYuvFileName),
                                   GetWorkingDir().Append(kStatsFileName)));
 }