diff options
| author | grunell@chromium.org <grunell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-13 16:10:25 +0000 |
|---|---|---|
| committer | grunell@chromium.org <grunell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-13 16:10:25 +0000 |
| commit | 6f5517f5fa5b6d8c5beaff04f45f46610dac6306 (patch) | |
| tree | 845773f41a51bd834d4895d7f55f5dbf81489f96 | |
| parent | d2f7bd9668849cc24bd41597d123c107985314fe (diff) | |
| download | chromium_src-6f5517f5fa5b6d8c5beaff04f45f46610dac6306.zip chromium_src-6f5517f5fa5b6d8c5beaff04f45f46610dac6306.tar.gz chromium_src-6f5517f5fa5b6d8c5beaff04f45f46610dac6306.tar.bz2 | |
Re-enable WebRtcDisableEncryptionFlagBrowserTest on main waterfall.
Remove MANUAL_ prefix.
Dependency on peerconnection_server has been removed so this test can be enabled again.
BUG=None
Review URL: https://codereview.chromium.org/283773002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270114 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc b/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc index 49e59a3..130d42e 100644 --- a/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc +++ b/chrome/browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc @@ -48,11 +48,8 @@ class WebRtcDisableEncryptionFlagBrowserTest : public WebRtcTestBase { }; // Makes a call and checks that there's encryption or not in the SDP offer. -// TODO(phoglund): this is unreliable on non-webrtc bots because its peer -// connection server could clash with other tests running in parallel, -// therefore only running manually. http://crbug.com/358207. IN_PROC_BROWSER_TEST_F(WebRtcDisableEncryptionFlagBrowserTest, - MANUAL_VerifyEncryption) { + VerifyEncryption) { // Flaky timeout on a webrtc Win XP bot. http://crbug.com/368163. #if defined (OS_WIN) if (base::win::GetVersion() < base::win::VERSION_VISTA) |