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

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

Issue 216773002: Relanding Switched main WebRTC browser tests to use a more realistic video (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months 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
Index: chrome/browser/media/chrome_webrtc_typing_detection_browsertest.cc
diff --git a/chrome/browser/media/chrome_webrtc_typing_detection_browsertest.cc b/chrome/browser/media/chrome_webrtc_typing_detection_browsertest.cc
index 465d241e82560c1d7b2af8f8a2aa7504e6911d55..241f1ea3825df3908a232d2fb0a5b2c101125750 100644
--- a/chrome/browser/media/chrome_webrtc_typing_detection_browsertest.cc
+++ b/chrome/browser/media/chrome_webrtc_typing_detection_browsertest.cc
@@ -52,7 +52,7 @@ class WebRtcTypingDetectionBrowserTest : public WebRtcTestBase {
// TODO(phoglund): clean up duplication from audio quality browser test when
// this test is complete and is proven to work.
virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
- PeerConnectionServerRunner::KillAllPeerConnectionServersOnCurrentSystem();
+ test::PeerConnectionServerRunner::KillAllPeerConnectionServers();
}
bool HasAllRequiredResources() {
@@ -88,13 +88,13 @@ class WebRtcTypingDetectionBrowserTest : public WebRtcTestBase {
ExecuteJavascript("negotiateCall()", from_tab));
// Ensure the call gets up on both sides.
- EXPECT_TRUE(PollingWaitUntil("getPeerConnectionReadyState()",
- "active", from_tab));
- EXPECT_TRUE(PollingWaitUntil("getPeerConnectionReadyState()",
- "active", to_tab));
+ EXPECT_TRUE(test::PollingWaitUntil("getPeerConnectionReadyState()",
+ "active", from_tab));
+ EXPECT_TRUE(test::PollingWaitUntil("getPeerConnectionReadyState()",
+ "active", to_tab));
}
- PeerConnectionServerRunner peerconnection_server_;
+ test::PeerConnectionServerRunner peerconnection_server_;
};
// TODO(phoglund): enable when fully implemented.
@@ -133,13 +133,13 @@ IN_PROC_BROWSER_TEST_F(WebRtcTypingDetectionBrowserTest,
// because the ready state is ok on both sides. We sleep a bit between call
// establishment and playing to avoid cutting of the beginning of the audio
// file.
- SleepInJavascript(left_tab, 2000);
+ test::SleepInJavascript(left_tab, 2000);
PlayAudioFile(left_tab);
// TODO(phoglund): simulate key presses, look for changes in typing detection
// state.
- SleepInJavascript(left_tab, 10000);
+ test::SleepInJavascript(left_tab, 10000);
HangUp(left_tab);
WaitUntilHangupVerified(left_tab);

Powered by Google App Engine
This is Rietveld 408576698