Revert 111004 - ASAN timeout on OutOfProcessPPAPITest.Crypto

chrome/test/ui/ppapi_uitest.cc

Index: chrome/test/ui/ppapi_uitest.cc
===================================================================
--- chrome/test/ui/ppapi_uitest.cc	(revision 111228)
+++ chrome/test/ui/ppapi_uitest.cc	(working copy)
@@ -290,16 +290,15 @@
 TEST_PPAPI_IN_PROCESS(CharSet)
 TEST_PPAPI_OUT_OF_PROCESS(CharSet)
 
-#if defined(ADDRESS_SANITIZER)
+TEST_PPAPI_IN_PROCESS(Crypto)
+#if defined(OS_POSIX)
 #define MAYBE_Crypto DISABLED_Crypto
 #else
 #define MAYBE_Crypto Crypto
 #endif
-// http://crbug.com/104832 fails on ASAN.
-TEST_F(PPAPITest, MAYBE_Crypto) {
-  RunTestViaHTTP("Crypto");
-}
-TEST_F(OutOfProcessPPAPITest, MAYBE_Crypto) {
+// http://crbug.com/104832 fails on ASAN, so this is an overly broad disable.
+// But ASAN currently doesn't have a way to disable specific tests.
+TEST_F(OutOfProcessPPAPITest, Crypto) {
   RunTest("Crypto");
 }