| Index: chrome/test/nacl/nacl_browsertest.cc
|
| diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc
|
| index 30b6053091da9a52bd5fa1bedc5a16bcea7c1e7d..7e2690181a5a6b7ba52adffb12779772516d4678 100644
|
| --- a/chrome/test/nacl/nacl_browsertest.cc
|
| +++ b/chrome/test/nacl/nacl_browsertest.cc
|
| @@ -377,68 +377,6 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, PnaclMimeType) {
|
| RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html"));
|
| }
|
|
|
| -class NaClBrowserTestNewlibStdoutPM : public NaClBrowserTestNewlib {
|
| - public:
|
| - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
|
| - // Env needs to be set early because nacl_helper is spawned before the test
|
| - // body on Linux.
|
| - scoped_ptr<base::Environment> env(base::Environment::Create());
|
| - env->SetVar("NACL_EXE_STDOUT", "DEBUG_ONLY:dev://postmessage");
|
| - NaClBrowserTestNewlib::SetUpInProcessBrowserTestFixture();
|
| - }
|
| -};
|
| -
|
| -IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStdoutPM, RedirectFg0) {
|
| - RunNaClIntegrationTest(FILE_PATH_LITERAL(
|
| - "pm_redir_test.html?stream=stdout&thread=fg&delay_us=0"));
|
| -}
|
| -
|
| -IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStdoutPM, RedirectBg0) {
|
| - RunNaClIntegrationTest(FILE_PATH_LITERAL(
|
| - "pm_redir_test.html?stream=stdout&thread=bg&delay_us=0"));
|
| -}
|
| -
|
| -IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStdoutPM, RedirectFg1) {
|
| - RunNaClIntegrationTest(FILE_PATH_LITERAL(
|
| - "pm_redir_test.html?stream=stdout&thread=fg&delay_us=1000000"));
|
| -}
|
| -
|
| -IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStdoutPM, RedirectBg1) {
|
| - RunNaClIntegrationTest(FILE_PATH_LITERAL(
|
| - "pm_redir_test.html?stream=stdout&thread=bg&delay_us=1000000"));
|
| -}
|
| -
|
| -class NaClBrowserTestNewlibStderrPM : public NaClBrowserTestNewlib {
|
| - public:
|
| - virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
|
| - // Env needs to be set early because nacl_helper is spawned before the test
|
| - // body on Linux.
|
| - scoped_ptr<base::Environment> env(base::Environment::Create());
|
| - env->SetVar("NACL_EXE_STDERR", "DEBUG_ONLY:dev://postmessage");
|
| - NaClBrowserTestNewlib::SetUpInProcessBrowserTestFixture();
|
| - }
|
| -};
|
| -
|
| -IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStderrPM, RedirectFg0) {
|
| - RunNaClIntegrationTest(FILE_PATH_LITERAL(
|
| - "pm_redir_test.html?stream=stderr&thread=fg&delay_us=0"));
|
| -}
|
| -
|
| -IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStderrPM, RedirectBg0) {
|
| - RunNaClIntegrationTest(FILE_PATH_LITERAL(
|
| - "pm_redir_test.html?stream=stderr&thread=bg&delay_us=0"));
|
| -}
|
| -
|
| -IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStderrPM, RedirectFg1) {
|
| - RunNaClIntegrationTest(FILE_PATH_LITERAL(
|
| - "pm_redir_test.html?stream=stderr&thread=fg&delay_us=1000000"));
|
| -}
|
| -
|
| -IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibStderrPM, RedirectBg1) {
|
| - RunNaClIntegrationTest(FILE_PATH_LITERAL(
|
| - "pm_redir_test.html?stream=stderr&thread=bg&delay_us=1000000"));
|
| -}
|
| -
|
| // TODO(ncbray) support glibc and PNaCl
|
| // flaky: crbug.com/375894
|
| IN_PROC_BROWSER_TEST_F(NaClBrowserTestNewlibExtension, DISABLED_MimeHandler) {
|
|
|