Move NaCl tests out of chrome/test

chrome/chrome_tests.gypi

 # Copyright (c) 2011 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.
 
 {
   'variables' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
@@ skipping 1021 matching lines @@
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                 },
               },
             },
           },
         }],
       ],
     },
     {
-      'target_name': 'nacl_security_tests',
-      'type': 'shared_library',
-      'include_dirs': [
-        '..'
-      ],
-      'sources': [
-       # mostly OS dependent files below...
-      ],
-      'conditions': [
-        ['OS=="mac"', {
-          # Only the Mac version uses gtest (linking issues on other platforms).
-          'dependencies': [
-            '../testing/gtest.gyp:gtest'
-          ],
-          'sources': [
-            'test/nacl_security_tests/commands_posix.cc',
-            'test/nacl_security_tests/commands_posix.h',
-            'test/nacl_security_tests/nacl_security_tests_posix.h',
-            'test/nacl_security_tests/nacl_security_tests_mac.cc',
-          ],
-          'xcode_settings': {
-             'DYLIB_INSTALL_NAME_BASE': '@executable_path/',
-          },
-        },],
-        ['OS=="linux"', {
-          'sources': [
-            'test/nacl_security_tests/commands_posix.cc',
-            'test/nacl_security_tests/commands_posix.h',
-            'test/nacl_security_tests/nacl_security_tests_posix.h',
-            'test/nacl_security_tests/nacl_security_tests_linux.cc',
-          ],
-        },],
-        ['OS=="win"', {
-          'sources': [
-            '../sandbox/tests/validation_tests/commands.cc',
-            '../sandbox/tests/validation_tests/commands.h',
-            '../sandbox/tests/common/controller.h',
-            'test/nacl_security_tests/nacl_security_tests_win.h',
-            'test/nacl_security_tests/nacl_security_tests_win.cc',
-          ],
-        },],
-        # Set fPIC in case it isn't set.
-        ['os_posix == 1 and OS != "mac"'
-         'and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', {
-          'cflags': ['-fPIC'],
-        },],
-      ],
-    },
-    {
-      'target_name': 'nacl_sandbox_tests',
-      'type': 'executable',
-      'dependencies': [
-        'chrome',
-        'browser',
-        'common',
-        'chrome_resources',
-        'chrome_strings',
-        'test_support_ui',
-        '../base/base.gyp:base',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
-        '../net/net.gyp:net',
-        '../skia/skia.gyp:skia',
-        '../testing/gtest.gyp:gtest',
-        '../third_party/icu/icu.gyp:icui18n',
-        '../third_party/icu/icu.gyp:icuuc',
-        '../third_party/libxml/libxml.gyp:libxml',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'test/nacl/nacl_test.cc',
-        'test/nacl/nacl_sandbox_test.cc'
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'dependencies': [
-            'chrome_nacl_win64',
-            'nacl_security_tests', # run time dependency
-            'nacl_security_tests64', # run time dependency
-            'test_support_common',
-            '../google_update/google_update.gyp:google_update',
-            '../views/views.gyp:views',
-            # run time dependency
-            '../webkit/webkit.gyp:copy_npapi_test_plugin',
-          ],
-          'conditions': [
-            ['win_use_allocator_shim==1', {
-              'dependencies': [
-                '<(allocator_target)',
-              ],
-            }],
-          ],
-          'link_settings': {
-            'libraries': [
-              '-lOleAcc.lib',
-            ],
-          },
-          'configurations': {
-            'Debug_Base': {
-              'msvs_settings': {
-                'VCLinkerTool': {
-                  'LinkIncremental': '<(msvs_debug_link_nonincremental)',
-                },
-              },
-            },
-          },
-        }],
-        ['OS=="mac"', {
-          'dependencies': [
-            'nacl_security_tests', # run time dependency
-          ],
-        }],
-      ],
-    },
-    {
-      'target_name': 'nacl_ui_tests',
-      'type': 'executable',
-      'dependencies': [
-        'chrome',
-        'browser',
-        'common',
-        'chrome_resources',
-        'chrome_strings',
-        'test_support_ui',
-        '../base/base.gyp:base',
-        '../build/temp_gyp/googleurl.gyp:googleurl',
-        '../net/net.gyp:net',
-        '../skia/skia.gyp:skia',
-        '../testing/gtest.gyp:gtest',
-        '../third_party/icu/icu.gyp:icui18n',
-        '../third_party/icu/icu.gyp:icuuc',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'test/nacl/nacl_test.cc',
-        'test/nacl/nacl_ui_test.cc',
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'dependencies': [
-            'chrome_nacl_win64',
-            'security_tests',  # run time dependency
-            'test_support_common',
-            '../google_update/google_update.gyp:google_update',
-            # run time dependency
-            '../webkit/webkit.gyp:copy_npapi_test_plugin',
-          ],
-          'conditions': [
-            ['win_use_allocator_shim==1', {
-              'dependencies': [
-                '<(allocator_target)',
-              ],
-            }],
-          ],
-          'link_settings': {
-            'libraries': [
-              '-lOleAcc.lib',
-            ],
-          },
-          'configurations': {
-            'Debug_Base': {
-              'msvs_settings': {
-                'VCLinkerTool': {
-                  'LinkIncremental': '<(msvs_debug_link_nonincremental)',
-                },
-              },
-            },
-          },
-        }],
-        ['toolkit_views==1', {
-          'dependencies': [
-            '../views/views.gyp:views',
-          ],
-        }],
-      ],
-    },
-    {
       'target_name': 'unit_tests',
       'type': 'executable',
       'dependencies': [
         # unit tests should only depend on
         # 1) everything that the chrome binaries depend on:
         '<@(chromium_dependencies)',
         # 2) test-specific support libraries:
         '../gpu/gpu.gyp:gpu_unittest_utils',
         '../jingle/jingle.gyp:jingle_glue_test_util',
         '../media/media.gyp:media_test_support',
@@ skipping 2566 matching lines @@
           ],
           'sources': [
             'test/security_tests/ipc_security_tests.cc',
             'test/security_tests/ipc_security_tests.h',
             'test/security_tests/security_tests.cc',
             '../content/common/injection_test_dll.h',
             '../sandbox/tests/validation_tests/commands.cc',
             '../sandbox/tests/validation_tests/commands.h',
           ],
         },
-        # Extra 64-bit DLL for windows
-        {
-          'target_name': 'nacl_security_tests64',
-          'type': 'shared_library',
-          'configurations': {
-            'Common_Base': {
-              'msvs_target_platform': 'x64',
-            },
-          },
-          'include_dirs': [
-            '..'
-          ],
-          'sources': [
-            '../sandbox/tests/validation_tests/commands.cc',
-            '../sandbox/tests/validation_tests/commands.h',
-            '../sandbox/tests/common/controller.h',
-            'test/nacl_security_tests/nacl_security_tests_win.h',
-            'test/nacl_security_tests/nacl_security_tests_win.cc',
-          ],
-        },
       ]},  # 'targets'
     ],  # OS=="win"
     # If you change this condition, make sure you also change it in all.gyp
     # for the chromium_builder_qa target.
     ['OS == "mac" or OS == "win" or (os_posix == 1 and target_arch == python_arch)', {
       'targets': [
         {
           # Documentation: http://dev.chromium.org/developers/testing/pyauto
           'target_name': 'pyautolib',
           'type': 'loadable_module',
@@ skipping 285 matching lines @@
               # Use outputs of this action as inputs for the main target build.
               # Seems as a misnomer but makes this happy on Linux (scons).
               'process_outputs_as_sources': 1,
             },
           ],  # 'actions'
         },
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }