Convert the remaining plugin_tests from ui_tests to browser_tests. Also remove the remaining refere…

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
===================================================================
--- chrome/chrome_tests.gypi	(revision 136820)
+++ chrome/chrome_tests.gypi	(working copy)
@@ -685,35 +685,7 @@
         }],  # OS != "win"
       ],  # conditions
     },
-    # TODO(jam): delete ui_tests target once no tests use this.
     {
-      'target_name': 'ui_tests',
-      'type': 'executable',
-      'dependencies': [
-        '../testing/gtest.gyp:gtest',
-        '../base/base.gyp:test_support_base',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        '../jingle/run_all_unittests.cc',
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'configurations': {
-            'Debug_Base': {
-              'msvs_settings': {
-                'VCLinkerTool': {
-                  'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
-                },
-              },
-            },
-          },
-        }],
-      ],
-    },
-    {
       # Third-party support sources for chromedriver_lib.
       'target_name': 'chromedriver_support',
       'type': 'static_library',
@@ -4183,44 +4155,6 @@
         'test/gpu/gpu_pixel_browsertest.cc',
       ],
     },
-    {
-      'target_name': 'plugin_tests',
-      'type': 'executable',
-      'dependencies': [
-        'chrome',
-        'chrome_resources.gyp:chrome_resources',
-        'chrome_resources.gyp:chrome_strings',
-        'test_support_common',
-        'test_support_ui',
-        '../skia/skia.gyp:skia',
-        '../testing/gtest.gyp:gtest',
-        '../third_party/libxslt/libxslt.gyp:libxslt',
-        '../third_party/npapi/npapi.gyp:npapi',
-      ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'browser/plugin_test.cc',
-      ],
-      'conditions': [
-        ['OS=="win"', {
-          'dependencies': [
-            'security_tests',  # run time dependency
-          ],
-          'conditions': [
-            ['win_use_allocator_shim==1', {
-              'dependencies': [
-                '<(allocator_target)',
-              ],
-            }],
-          ],
-          'include_dirs': [
-            '<(DEPTH)/third_party/wtl/include',
-          ],
-        },],
-      ],
-    },
   ],
   'conditions': [
     ['OS=="mac"', {