Revert 205329 "Split pnacl and nacl mime types"

trunk/src/chrome/test/nacl/nacl_browsertest.cc

Index: trunk/src/chrome/test/nacl/nacl_browsertest.cc
===================================================================
--- trunk/src/chrome/test/nacl/nacl_browsertest.cc	(revision 205338)
+++ trunk/src/chrome/test/nacl/nacl_browsertest.cc	(working copy)
@@ -14,7 +14,6 @@
 #define MAYBE_ExitStatusNeg2 DISABLED_ExitStatusNeg2
 #define MAYBE_PPAPICore DISABLED_PPAPICore
 #define MAYBE_ProgressEvents DISABLED_ProgressEvents
-#define MAYBE_PnaclMimeType DISABLED_PnaclMimeType
 #define MAYBE_CrossOriginCORS DISABLED_CrossOriginCORS
 #define MAYBE_CrossOriginFail DISABLED_CrossOriginFail
 #define MAYBE_SameOriginCookie DISABLED_SameOriginCookie
@@ -26,7 +25,6 @@
 #define MAYBE_ExitStatusNeg2 ExitStatusNeg2
 #define MAYBE_PPAPICore PPAPICore
 #define MAYBE_ProgressEvents ProgressEvents
-#define MAYBE_PnaclMimeType PnaclMimeType
 #define MAYBE_CrossOriginCORS CrossOriginCORS
 #define MAYBE_CrossOriginFail CrossOriginFail
 #define MAYBE_SameOriginCookie SameOriginCookie
@@ -60,10 +58,6 @@
   RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_progress_events.html"));
 })
 
-NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_PnaclMimeType, {
-  RunLoadTest(FILE_PATH_LITERAL("pnacl_mime_type.html"));
-})
-
 IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, MAYBE_CrossOriginCORS) {
   RunLoadTest(FILE_PATH_LITERAL("cross_origin/cors.html"));
 }