Revert 205329 "Split pnacl and nacl mime types"

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/nacl/nacl_browsertest_util.h"
 
 namespace {
 
 // These tests fail on Linux ASAN bots: <http://crbug.com/161709>.
 #if defined(OS_LINUX) && defined(ADDRESS_SANITIZER)
 #define MAYBE_SimpleLoad DISABLED_SimpleLoad
 #define MAYBE_ExitStatus0 DISABLED_ExitStatus0
 #define MAYBE_ExitStatus254 DISABLED_ExitStatus254
 #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
 #define MAYBE_CORSNoCookie DISABLED_CORSNoCookie
 #else
 #define MAYBE_SimpleLoad SimpleLoad
 #define MAYBE_ExitStatus0 ExitStatus0
 #define MAYBE_ExitStatus254 ExitStatus254
 #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
 #define MAYBE_CORSNoCookie CORSNoCookie
 #endif
 
 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_SimpleLoad, {
   RunLoadTest(FILE_PATH_LITERAL("nacl_load_test.html"));
 })
 
@@ skipping 13 matching lines @@
 })
 
 NACL_BROWSER_TEST_F(NaClBrowserTest, MAYBE_PPAPICore, {
   RunNaClIntegrationTest(FILE_PATH_LITERAL("ppapi_ppb_core.html"));
 })
 
 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"));
-})
-
 IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, MAYBE_CrossOriginCORS) {
   RunLoadTest(FILE_PATH_LITERAL("cross_origin/cors.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, MAYBE_CrossOriginFail) {
   RunLoadTest(FILE_PATH_LITERAL("cross_origin/fail.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(NaClBrowserTestStatic, MAYBE_SameOriginCookie) {
   RunLoadTest(FILE_PATH_LITERAL("cross_origin/same_origin_cookie.html"));
@@ skipping 28 matching lines @@
   RunLoadTest(FILE_PATH_LITERAL("pnacl_options.html?use_nmf=time_passes"));
 }
 
 IN_PROC_BROWSER_TEST_F(NaClBrowserTestPnacl,
                        MAYBE_PNACL(PnaclDyncodeSyscallDisabled)) {
   RunNaClIntegrationTest(FILE_PATH_LITERAL(
       "pnacl_dyncode_syscall_disabled.html"));
 }
 
 }  // namespace anonymous