Revert 175828

content/browser/media_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/string16.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 119 matching lines @@
   PlayAudio("bear_mulaw.wav", GetParam());
 }
 
 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearFlac) {
   PlayAudio("bear.flac", GetParam());
 }
 #endif
 #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());
 }
 
 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm3kHz) {
   PlayAudio("bear_3kHz.wav", GetParam());
 }
 
 IN_PROC_BROWSER_TEST_P(MediaTest, VideoBearWavPcm192kHz) {
   PlayAudio("bear_192kHz.wav", GetParam());
 }
@@ skipping 23 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoLoopTest) {
   RunLayoutTest("video-loop.html");
 }
 
 IN_PROC_BROWSER_TEST_F(MediaLayoutTest, VideoNoAutoplayTest) {
   RunLayoutTest("video-no-autoplay.html");
 }
 
 }  // namespace content