Revert 111202 - ASAN failing tests on OutOfProcessPPAPITest.*

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 253 matching lines @@
 #if defined(OS_WIN)
 // It often takes too long time (and fails otherwise) on Windows.
 #define MAYBE_URLLoader DISABLED_URLLoader
 #else
 #define MAYBE_URLLoader FAILS_URLLoader
 #endif
 TEST_F(OutOfProcessPPAPITest, MAYBE_URLLoader) {
   RunTestViaHTTP("URLLoader");
 }
 
-// http://crbug.com/104832
-#if defined(ADDRESS_SANITIZER)
-#define MAYBE_PaintAggregator DISABLED_PaintAggregator
-#else
-#define MAYBE_PaintAggregator PaintAggregator
-#endif
+
+
 TEST_PPAPI_IN_PROCESS(PaintAggregator)
-TEST_F(OutOfProcessPPAPITest, MAYBE_PaintAggregator) {
-  RunTest("PaintAggregator");
-}
+TEST_PPAPI_OUT_OF_PROCESS(PaintAggregator)
 TEST_PPAPI_NACL_VIA_HTTP(PaintAggregator)
 
-#if defined(ADDRESS_SANITIZER)
-#define MAYBE_Scrollbar DISABLED_Scrollbar
-#else
-#define MAYBE_Scrollbar FAILS_Scrollbar
-#endif
 TEST_PPAPI_IN_PROCESS(Scrollbar)
 // http://crbug.com/89961
-// http://crbug.com/104832
-TEST_F(OutOfProcessPPAPITest, MAYBE_Scrollbar) {
+TEST_F(OutOfProcessPPAPITest, FAILS_Scrollbar) {
   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)
 
@@ skipping 156 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)