| Index: chrome/test/nacl/nacl_browsertest.cc
|
| diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc
|
| index f8af44ca12d336c08062f23115844fa72dac3e26..e24b910370fa901f4860007267fd174470ffda8c 100644
|
| --- a/chrome/test/nacl/nacl_browsertest.cc
|
| +++ b/chrome/test/nacl/nacl_browsertest.cc
|
| @@ -85,10 +85,6 @@ 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
|
| @@ -192,4 +188,13 @@ 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
|
|
|