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

chrome/chrome_tests.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' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
       'common/pref_names.cc',
@@ skipping 667 matching lines @@
             },
           },  # configurations
         }, { # else: OS != "win"
           'sources!': [
             'browser/ui/views/constrained_window_views_browsertest.cc',
             'browser/ui/views/ssl_client_certificate_selector_browsertest.cc',
           ],
         }],  # 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',
       'sources': [
         '../third_party/mongoose/mongoose.c',
         '../third_party/mongoose/mongoose.h',
         '../third_party/webdriver/atoms.cc',
         '../third_party/webdriver/atoms.h',
       ],
@@ skipping 3450 matching lines @@
       # software rasterizer.
       'target_name': 'soft_gpu_tests',
       'type': 'executable',
       'includes': [
         'test/gpu/test_support_gpu.gypi'
       ],
       'sources': [
         '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"', {
       'targets': [
         {
           # This is the mac equivalent of the security_tests target below. It
           # generates a framework bundle which bundles tests to be run in a
           # renderer process. The test code is built as a framework so it can be
           # run in the context of a renderer without shipping the code to end
           # users.
@@ skipping 473 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'
 }