Move NPAPI unit tests from test_shell_tests to content_unittests.

BUG=126514


Review URL: https://chromiumcodereview.appspot.com/10826052

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148867 0039d316-1c4b-4281-b951-d872f2087c98

content/content_tests.gypi

@@ -232,6 +232,7 @@
         '../webkit/support/webkit_support.gyp:glue',
         '../webkit/support/webkit_support.gyp:quota',
         '../webkit/support/webkit_support.gyp:webkit_media',
+        '../webkit/webkit.gyp:test_shell_test_support',
       ],
       'include_dirs': [
         '..',
@@ -415,6 +416,10 @@
         '../webkit/media/test_response_generator.h',
         '../webkit/mocks/mock_weburlloader.cc',
         '../webkit/mocks/mock_weburlloader.h',
+        '../webkit/plugins/npapi/plugin_group_unittest.cc',
+        '../webkit/plugins/npapi/plugin_lib_unittest.cc',
+        '../webkit/plugins/npapi/plugin_list_unittest.cc',
+        '../webkit/plugins/npapi/webplugin_impl_unittest.cc',
         '../webkit/quota/mock_quota_manager.cc',
         '../webkit/quota/mock_quota_manager.h',
         '../webkit/quota/mock_quota_manager_unittest.cc',

webkit/tools/test_shell/test_shell.gypi

@@ -331,6 +331,8 @@
       ],
     },
     {
+      # 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': [
@@ -350,7 +352,6 @@
       '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',
@@ -379,10 +380,6 @@
         '../../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',