Non-SFI NaCl: Fix browser_tests based on libc_free.c

chrome/test/nacl/nacl_browsertest.cc

 // Copyright (c) 2012 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 <stdio.h>
 #if defined(OS_POSIX)
 #include <unistd.h>
 #elif defined(OS_WIN)
 #include <windows.h>
 #endif
@@ skipping 15 matching lines @@
 
 namespace {
 
 #if defined(OS_WIN)
 // crbug.com/98721
 #  define MAYBE_SysconfNprocessorsOnln DISABLED_SysconfNprocessorsOnln
 #else
 #  define MAYBE_SysconfNprocessorsOnln SysconfNprocessorsOnln
 #endif
 
-// crbug.com/392768
-#if defined(OS_LINUX)
-#  define MAYBE_Messaging DISABLED_Messaging
-#  define MAYBE_Irt DISABLED_Irt
-#else
-#  define MAYBE_Messaging MAYBE_NONSFI(Messaging)
-#  define MAYBE_Irt MAYBE_NONSFI(Irt)
-#endif
-
 NACL_BROWSER_TEST_F(NaClBrowserTest, SimpleLoad, {
   RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html"));
 })
 
-IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_Messaging) {
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NONSFI(Messaging)) {
   RunLoadTest(FILE_PATH_LITERAL("libc_free.html"));
 }
 
-IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_Irt) {
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NONSFI(Irt)) {
   RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_test.html"));
 }
 
 NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus0, {
   RunNaClIntegrationTest(FILE_PATH_LITERAL(
       "pm_exit_status_test.html?trigger=exit0&expected_exit=0"));
 })
 
 NACL_BROWSER_TEST_F(NaClBrowserTest, ExitStatus254, {
   RunNaClIntegrationTest(FILE_PATH_LITERAL(
@@ skipping 400 matching lines @@
 #define MAYBE_MimeHandler DISABLED_MimeHandler
 #else
 #define MAYBE_MimeHandler MimeHandler
 #endif
 IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, MAYBE_MimeHandler) {
   RunNaClIntegrationTest(FILE_PATH_LITERAL(
       "ppapi_extension_mime_handler.html"));
 }
 
 }  // namespace