Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2003)

Unified Diff: chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc

Issue 99333010: Working around the page load problem on Linux, re-enable tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/media/chrome_webrtc_browsertest.cc ('k') | chrome/browser/media/webrtc_browsertest_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 827a862d2a2139bb1d24ce49a0526950a1013b57..7d18b4774c07f09933e7f13bd60166f9af38981f 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()) {}
@@ -323,7 +315,7 @@ 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_GE(TestTimeouts::action_max_timeout().InSeconds(), 150) <<
"This is a long-running test; you must specify "
@@ -334,18 +326,12 @@ IN_PROC_BROWSER_TEST_F(MAYBE_WebrtcVideoQualityBrowserTest,
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);
« no previous file with comments | « chrome/browser/media/chrome_webrtc_browsertest.cc ('k') | chrome/browser/media/webrtc_browsertest_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698