| Index: chrome/test/nacl/nacl_browsertest.cc
|
| diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc
|
| index 356d183b1a6c246469b7188a6e385266d6d13568..e16aae4fa9d4c4b10bc3b5aedf54584543f2ad1f 100644
|
| --- a/chrome/test/nacl/nacl_browsertest.cc
|
| +++ b/chrome/test/nacl/nacl_browsertest.cc
|
| @@ -85,6 +85,10 @@ NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_ProgressEvents, {
|
| RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_progress_events.html"));
|
| })
|
|
|
| +NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_PnaclMimeType, {
|
| + RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html"));
|
| +})
|
| +
|
| // Some versions of Visual Studio does not like preprocessor
|
| // conditionals inside the argument of a macro, so we put the
|
| // conditionals on a helper function. We are already in an anonymous
|
| @@ -188,13 +192,4 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
|
| "pnacl_exception_handling_disabled.html"));
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, MAYBE_PNACL(PnaclMimeType)) {
|
| - RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html"));
|
| -}
|
| -
|
| -IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclDisabled,
|
| - MAYBE_PNACL(PnaclMimeType)) {
|
| - RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html"));
|
| -}
|
| -
|
| } // namespace
|
|
|