diff options
| author | sheu@chromium.org <sheu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 13:34:05 +0000 |
|---|---|---|
| committer | sheu@chromium.org <sheu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-14 13:34:05 +0000 |
| commit | 4d34185f928bce21e538a59714e9cfb0634f3e0e (patch) | |
| tree | df1341db50888fda22f176b146c9329df9ad24f9 | |
| parent | d46c050b63f6d2ae1ce8547062686ab3373c9d1c (diff) | |
| download | chromium_src-4d34185f928bce21e538a59714e9cfb0634f3e0e.zip chromium_src-4d34185f928bce21e538a59714e9cfb0634f3e0e.tar.gz chromium_src-4d34185f928bce21e538a59714e9cfb0634f3e0e.tar.bz2 | |
Revert "linux-aura/webrtc: Disable a couple of tests failing on the bots."
Flakiness should be fixed. Renabling tests.
BUG=335916,341265
TEST=trybots
Review URL: https://codereview.chromium.org/145093006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251285 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/media/webrtc_browsertest.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/content/browser/media/webrtc_browsertest.cc b/content/browser/media/webrtc_browsertest.cc index f9c4c5c..63613ca 100644 --- a/content/browser/media/webrtc_browsertest.cc +++ b/content/browser/media/webrtc_browsertest.cc @@ -135,10 +135,6 @@ IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, // Disabled for Ozone, see http://crbug.com/315392#c15 #define MAYBE_NegotiateUnsupportedVideoCodec\ DISABLED_NegotiateUnsupportedVideoCodec -#elif defined(OS_LINUX) && defined(USE_AURA) -// http://crbug.com/335916 -#define MAYBE_NegotiateUnsupportedVideoCodec\ - DISABLED_NegotiateUnsupportedVideoCodec #else #define MAYBE_NegotiateUnsupportedVideoCodec NegotiateUnsupportedVideoCodec #endif @@ -153,9 +149,6 @@ IN_PROC_BROWSER_TEST_F(WebRtcBrowserTest, #if defined(USE_OZONE) // Disabled for Ozone, see http://crbug.com/315392#c15 #define MAYBE_NegotiateNonCryptoCall DISABLED_NegotiateNonCryptoCall -#elif defined(OS_LINUX) && defined(USE_AURA) -// http:://crbug.com/335916 -#define MAYBE_NegotiateNonCryptoCall DISABLED_NegotiateNonCryptoCall #else #define MAYBE_NegotiateNonCryptoCall NegotiateNonCryptoCall #endif |