Revert 111004 - ASAN timeout on OutOfProcessPPAPITest.Crypto

Disables OutOfProcessPPAPITest.Crypto test on ASAN.

BUG=104832
TEST=ASAN bot runs green
TBR=glider@chromium.org

Review URL: http://codereview.chromium.org/8618002

TBR=dhollowa@chromium.org
Review URL: http://codereview.chromium.org/8649006

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

chrome/test/ui/ppapi_uitest.cc

@@ -290,16 +290,15 @@ TEST_PPAPI_OUT_OF_PROCESS(URLUtil)
 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");
 }