Revert 205329 "Split pnacl and nacl mime types"

trunk/src/chrome/test/data/nacl/nacl_test_data.gyp

 # 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.
 
 {
   'includes': [
     '../../../../ppapi/ppapi_nacl_test_common.gypi',
   ],
   'targets': [
     {
@@ skipping 141 matching lines @@
           'pnacl_error_handling/pnacl_bad2_pexe.nmf',
           'pnacl_error_handling/pnacl_bad_doesnotexist.nmf',
           'pnacl_error_handling/pnacl_bad_pexe_undefined_syms.nmf',
         ],
       },
       'dependencies': [
         '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
       ]
     },
     {
-      'target_name': 'pnacl_mime_type_test',
-      'type': 'none',
-      'variables': {
-        'build_newlib': 1,
-        'build_glibc': 1,
-        'build_pnacl_newlib': 1,
-        'nexe_destination_dir': 'nacl_test_data',
-        # No need to translate AOT.
-        'enable_x86_32': 0,
-        'enable_x86_64': 0,
-        'enable_arm': 0,
-        'test_files': [
-          'pnacl_mime_type/pnacl_mime_type.html',
-        ],
-      },
-    },
-    {
       'target_name': 'pnacl_options_test',
       'type': 'none',
       'variables': {
         'nexe_target': 'pnacl_options',
         'build_pnacl_newlib': 1,
         'nexe_destination_dir': 'nacl_test_data',
         # No need to translate these AOT, when we just need the pexe.
         'enable_x86_32': 0,
         'enable_x86_64': 0,
         'enable_arm': 0,
@@ skipping 76 matching lines @@
         '<(DEPTH)/native_client/tools.gyp:prep_toolchain',
         '<(DEPTH)/native_client/src/shared/platform/platform.gyp:platform_lib',
         '<(DEPTH)/native_client/src/shared/gio/gio.gyp:gio_lib',
         '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib',
         '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib',
         'ppapi_test_lib',
       ],
     },
   ],
 }