Enable EncryptedMediaTest on ASAN bots.

BUG=153231

Review URL: https://chromiumcodereview.appspot.com/11230059

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163640 0039d316-1c4b-4281-b951-d872f2087c98

content/browser/encrypted_media_browsertest.cc

@@ -104,20 +104,6 @@ class EncryptedMediaTest
   }
 };
 
-// Fails on Linux/ChromeOS with ASan.  http://crbug.com/153231
-// IN_PROC_BROWSER_TEST_P doesn't accept #define MAYBE_test DISABLED_test.
-#if (defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(ADDRESS_SANITIZER)
-IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_BasicPlayback) {
-  const string16 kExpected = ASCIIToUTF16("ENDED");
-  ASSERT_NO_FATAL_FAILURE(TestSimplePlayback("bear-320x240-encrypted.webm",
-                                             GetParam(), kExpected));
-}
-
-IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, DISABLED_FrameChangeVideo) {
-  const string16 kExpected = ASCIIToUTF16("ENDED");
-  ASSERT_NO_FATAL_FAILURE(TestFrameSizeChange(GetParam(), kExpected));
-}
-#else
 IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, BasicPlayback) {
   const string16 kExpected = ASCIIToUTF16("ENDED");
   ASSERT_NO_FATAL_FAILURE(TestSimplePlayback("bear-320x240-encrypted.webm",
@@ -128,7 +114,6 @@ IN_PROC_BROWSER_TEST_P(EncryptedMediaTest, FrameChangeVideo) {
   const string16 kExpected = ASCIIToUTF16("ENDED");
   ASSERT_NO_FATAL_FAILURE(TestFrameSizeChange(GetParam(), kExpected));
 }
-#endif
 
 IN_PROC_BROWSER_TEST_F(EncryptedMediaTest, InvalidKeySystem) {
   const string16 kExpected = ASCIIToUTF16(