Move NPAPI unit tests from test_shell_tests to content_unittests.

webkit/tools/test_shell/test_shell.gypi

 # 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.
 
 {
   'variables': {
     'test_shell_windows_resource_files': [
       'resources/test_shell.rc',
       '../../glue/resources/pan_east.cur',
       '../../glue/resources/pan_middle.cur',
@@ skipping 313 matching lines @@
           'dependencies': [
             '<(DEPTH)/net/net.gyp:net_resources',
             '<(DEPTH)/ui/ui.gyp:ui_resources',
             '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_resources',
             '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_strings',
           ]
         }],
       ],
     },
     {
+      # TODO(tony): This should be moved to webkit_glue.gypi or
+      # webkit_tests.gypi and named something like test_mock_plugin_list.
       'target_name': 'test_shell_test_support',
       'type': 'static_library',
       'dependencies': [
         '<(DEPTH)/webkit/support/webkit_support.gyp:glue'
       ],
       'sources': [
         '../../plugins/npapi/mock_plugin_list.cc',
         '../../plugins/npapi/mock_plugin_list.h',
       ]
     },
     {
       'target_name': 'test_shell_tests',
       'type': 'executable',
       'variables': {
         'chromium_code': 1,
       },
       'dependencies': [
         '../build/temp_gyp/googleurl.gyp:googleurl',
         'test_shell_common',
-        'test_shell_test_support',
         '<(DEPTH)/base/base.gyp:test_support_base',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/net/net.gyp:net_test_support',
         '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/testing/gmock.gyp:gmock',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_user_agent',
       ],
       'sources': [
         '../../glue/bookmarklet_unittest.cc',
         '../../glue/cpp_bound_class_unittest.cc',
         '../../glue/cpp_variant_unittest.cc',
         '../../glue/dom_operations_unittest.cc',
         '../../glue/dom_serializer_unittest.cc',
         '../../glue/glue_serialize_unittest.cc',
         '../../glue/multipart_response_delegate_unittest.cc',
         '../../glue/regular_expression_unittest.cc',
         '../../glue/resource_fetcher_unittest.cc',
         '../../glue/unittest_test_server.h',
         '../../glue/webcursor_unittest.cc',
         '../../glue/webkit_glue_unittest.cc',
         '../../glue/worker_task_runner_unittest.cc',
         '../../mocks/mock_resource_loader_bridge.h',
         '../../mocks/mock_webframeclient.h',
         '../../mocks/mock_weburlloader.cc',
         '../../mocks/mock_weburlloader.h',
-        '../../plugins/npapi/plugin_group_unittest.cc',
-        '../../plugins/npapi/plugin_lib_unittest.cc',
-        '../../plugins/npapi/plugin_list_unittest.cc',
-        '../../plugins/npapi/webplugin_impl_unittest.cc',
         '../../plugins/ppapi/host_var_tracker_unittest.cc',
         '../../plugins/ppapi/mock_plugin_delegate.cc',
         '../../plugins/ppapi/mock_plugin_delegate.h',
         '../../plugins/ppapi/mock_resource.h',
         '../../plugins/ppapi/ppb_graphics_2d_impl_unittest.cc',
         '../../plugins/ppapi/ppapi_unittest.cc',
         '../../plugins/ppapi/ppapi_unittest.h',
         '../../plugins/ppapi/quota_file_io_unittest.cc',
         '../../plugins/ppapi/time_conversion_unittest.cc',
         '../../plugins/ppapi/url_request_info_unittest.cc',
@@ skipping 238 matching lines @@
               'action_name': 'test_shell_resources',
               'includes': [ '../../../build/grit_action.gypi' ],
             },
           ],
           'includes': [ '../../../build/grit_target.gypi' ],
         },
       ],
     }],
   ],
 }