2 files changed, 0 insertions, 41 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index bb83541..d236c21 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -440,7 +440,6 @@
         'test_support_ui',
         '../base/base.gyp:base',
         '../build/temp_gyp/googleurl.gyp:googleurl',
-        '../native_client/src/trusted/platform_qualify/platform_qualify.gyp:platform_qual_lib',
         '../net/net.gyp:net',
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
diff --git a/chrome/test/nacl/nacl_test.cc b/chrome/test/nacl/nacl_test.cc
index eaf61ce..2d2b8f6 100644
--- a/chrome/test/nacl/nacl_test.cc
+++ b/chrome/test/nacl/nacl_test.cc
@@ -60,11 +60,6 @@ NaClTest::NaClTest()
 #if defined(OS_MACOSX)
   launch_arguments_.AppendSwitch(switches::kNoSandbox);
 #endif
-
-#if defined(OS_WIN)
-  if (NaClOsIs64BitWindows())
-    launch_arguments_.AppendSwitch(switches::kNoSandbox);
-#endif
 }
 
 NaClTest::~NaClTest() {}
@@ -255,72 +250,37 @@ int NaClTest::NaClTestTimeout() {
   return std::max(kNaClTestTimeout, action_max_timeout_ms());
 }
 
-#if defined(OS_MACOSX)
-// http://code.google.com/p/nativeclient/issues/detail?id=342
-TEST_F(NaClTest, FLAKY_ServerTest) {
-#else
 TEST_F(NaClTest, ServerTest) {
-#endif
   FilePath test_file(kServerHtmlFileName);
   RunTest(test_file, NaClTestTimeout());
 }
 
-#if defined(OS_MACOSX)
-// http://code.google.com/p/nativeclient/issues/detail?id=342
-TEST_F(NaClTest, FLAKY_SrpcHelloWorld) {
-#else
 TEST_F(NaClTest, SrpcHelloWorld) {
-#endif
   FilePath test_file(kSrpcHwHtmlFileName);
   RunTest(test_file, NaClTestTimeout());
 }
 
-#if defined(OS_MACOSX)
-// http://code.google.com/p/nativeclient/issues/detail?id=342
-TEST_F(NaClTest, FLAKY_SrpcBasicTest) {
-#else
 TEST_F(NaClTest, SrpcBasicTest) {
-#endif
   FilePath test_file(kSrpcBasicHtmlFileName);
   RunTest(test_file, NaClTestTimeout());
 }
 
-#if defined(OS_MACOSX)
-// http://code.google.com/p/nativeclient/issues/detail?id=342
-TEST_F(NaClTest, FLAKY_SrpcSockAddrTest) {
-#else
 TEST_F(NaClTest, SrpcSockAddrTest) {
-#endif
   FilePath test_file(kSrpcSockAddrHtmlFileName);
   RunTest(test_file, NaClTestTimeout());
 }
 
-#if defined(OS_MACOSX)
-// http://code.google.com/p/nativeclient/issues/detail?id=342
-TEST_F(NaClTest, FLAKY_SrpcShmTest) {
-#else
 TEST_F(NaClTest, SrpcShmTest) {
-#endif
   FilePath test_file(kSrpcShmHtmlFileName);
   RunTest(test_file, NaClTestTimeout());
 }
 
-#if defined(OS_MACOSX)
-// http://code.google.com/p/nativeclient/issues/detail?id=342
-TEST_F(NaClTest, FLAKY_SrpcPluginTest) {
-#else
 TEST_F(NaClTest, SrpcPluginTest) {
-#endif
   FilePath test_file(kSrpcPluginHtmlFileName);
   RunTest(test_file, NaClTestTimeout());
 }
 
-#if defined(OS_MACOSX)
-// http://code.google.com/p/nativeclient/issues/detail?id=342
-TEST_F(NaClTest, FLAKY_SrpcNrdXferTest) {
-#else
 TEST_F(NaClTest, SrpcNrdXferTest) {
-#endif
   FilePath test_file(kSrpcNrdXferHtmlFileName);
   RunTest(test_file, NaClTestTimeout());
 }