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..2cad78ab96e00937ecd374ffba74ddee03f89bf3 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,12 @@ IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
       "pnacl_exception_handling_disabled.html"));
 }
 
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl, PnaclMimeType) {
+  RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html"));
+}
+
+IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnaclDisabled, PnaclMimeType) {
+  RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html"));
+}
+
 }  // namespace