diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 21:29:48 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-09 21:29:48 +0000 |
| commit | b734490f845a4291c60b14248cc2f1af62dfe7f9 (patch) | |
| tree | 8c9ba112b243d08295089896d45ff6882c70444e | |
| parent | 26aa43d7fab4268004c34d31f26ce1e5b1b425a8 (diff) | |
| download | chromium_src-b734490f845a4291c60b14248cc2f1af62dfe7f9.zip chromium_src-b734490f845a4291c60b14248cc2f1af62dfe7f9.tar.gz chromium_src-b734490f845a4291c60b14248cc2f1af62dfe7f9.tar.bz2 | |
Revert 175828
Apparently the problem is in non-media code.
See http://crbug.com/166528
> Disable Http/MediaTest.VideoBearWavPcm/0 to stop ASAN failures.
>
> BUG=169031
> TBR=scherkus@chromium.org
>
> Review URL: https://codereview.chromium.org/11817021
TBR=acolwell@chromium.org
Review URL: https://codereview.chromium.org/11821035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@175888 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/browser/media_browsertest.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/content/browser/media_browsertest.cc b/content/browser/media_browsertest.cc index 25e08af..060ea30 100644 --- a/content/browser/media_browsertest.cc +++ b/content/browser/media_browsertest.cc @@ -137,12 +137,6 @@ IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearFlac) { #endif IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm) { - // Temporarily skip running HTTP version of the - // test since it times out frequently on the ASAN bots. - // Remove this condition once http://crbug.com/169031 - // has been fixed. - if (GetParam()) - return; PlayAudio("bear_pcm.wav", GetParam()); } |