Revert 111004 - ASAN timeout on OutOfProcessPPAPITest.Crypto

chrome/test/ui/ppapi_uitest.cc

 // Copyright (c) 2011 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/file_util.h"
 #include "base/path_service.h"
 #include "base/test/test_timeouts.h"
 #include "build/build_config.h"
 #include "content/browser/plugin_service.h"
 #include "content/public/common/content_switches.h"
@@ skipping 272 matching lines @@
   RunTest("Scrollbar");
 }
 TEST_PPAPI_NACL_VIA_HTTP(Scrollbar)
 
 TEST_PPAPI_IN_PROCESS(URLUtil)
 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");
 }
 
 TEST_PPAPI_IN_PROCESS(Var)
 // http://crbug.com/89961
 TEST_F(OutOfProcessPPAPITest, FAILS_Var) {
   RunTest("Var");
 }
 TEST_PPAPI_NACL_VIA_HTTP(Var)
 
@@ skipping 136 matching lines @@
 TEST_PPAPI_IN_PROCESS(Flash_GetLocalTimeZoneOffset)
 TEST_PPAPI_IN_PROCESS(Flash_GetCommandLineArgs)
 TEST_PPAPI_OUT_OF_PROCESS(Flash_SetInstanceAlwaysOnTop)
 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetProxyForURL)
 TEST_PPAPI_OUT_OF_PROCESS(Flash_MessageLoop)
 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetLocalTimeZoneOffset)
 TEST_PPAPI_OUT_OF_PROCESS(Flash_GetCommandLineArgs)
 
 TEST_PPAPI_IN_PROCESS(WebSocket_Create)
 TEST_PPAPI_IN_PROCESS(WebSocket_IsWebSocket)