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

chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc

Index: chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc
diff --git a/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc b/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc
index 9b79d3ec7f34cf6f6a4c71ad9c856e98e4b8452a..ef325d125424be30abaefd852f76f6dde344f788 100644
--- a/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc
+++ b/chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc
@@ -30,14 +30,6 @@
 #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");
@@ -100,9 +92,9 @@ static const char kPyWebSocketPortNumber[] = "12221";
 // 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()) {}
 
@@ -331,25 +323,19 @@ class MAYBE_WebrtcVideoQualityBrowserTest : public WebRtcTestBase {
   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);