Enable PNaCl by default (revert disabling CL)

chrome/test/nacl/nacl_browsertest.cc

Index: chrome/test/nacl/nacl_browsertest.cc
diff --git a/chrome/test/nacl/nacl_browsertest.cc b/chrome/test/nacl/nacl_browsertest.cc
index bd22046caf0d8e8fa0fb7d5bc22729161bcd0d26..1c1f709ca5c83d6fba8e7317bf9f2d4b680bf8d4 100644
--- a/chrome/test/nacl/nacl_browsertest.cc
+++ b/chrome/test/nacl/nacl_browsertest.cc
@@ -58,10 +58,6 @@ NACL_BROWSER_TEST_F(NaClBrowserTest, ProgressEvents, {
   RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_progress_events.html"));
 })
 
-NACL_BROWSER_TEST_F(NaClBrowserTest, 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
@@ -165,4 +161,13 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
       "pnacl_exception_handling_disabled.html"));
 }
 
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, MAYBE_PNACL(PnaclMimeType)) {

[jvoung (off chromium), 2013/08/20 20:32:52]

Now that I think of it, you don't need the MAYBE_PNACL() here, since it's not
actually loading a pexe.

The MAYBE_PNACL() macro exists there because on windows unoptimized debug
builds, the validator and validation cache are too slow and cause timeouts.

[sehr, 2013/08/20 21:36:39]

Removed in both places.

+  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