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

trunk/src/chrome/test/nacl/nacl_browsertest.cc

Index: trunk/src/chrome/test/nacl/nacl_browsertest.cc
===================================================================
--- trunk/src/chrome/test/nacl/nacl_browsertest.cc	(revision 282701)
+++ trunk/src/chrome/test/nacl/nacl_browsertest.cc	(working copy)
@@ -33,15 +33,24 @@
 #  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_NONSFI(Messaging)) {
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_Messaging) {
   RunLoadTest(FILE_PATH_LITERAL("libc_free.html"));
 }
 
-IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_NONSFI(Irt)) {
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestNonSfiMode, MAYBE_Irt) {
   RunNaClIntegrationTest(FILE_PATH_LITERAL("irt_test.html"));
 }