Reland 111519: Remove default plug-in on Mac, Gtk and Aura.

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.
 {
   'target_defaults': {
     'conditions': [
       ['strip_tests==1', {
         'cflags!': [ '-g' ],
         'ldflags': [ '-Wl,--strip-debug' ],
       }],
@@ skipping 716 matching lines @@
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/icu/icu.gyp:icui18n',
         '../third_party/icu/icu.gyp:icuuc',
         '../third_party/libxml/libxml.gyp:libxml',
         # run time dependencies
-        'default_plugin/default_plugin.gyp:default_plugin',
         '../ppapi/ppapi_internal.gyp:ppapi_tests',
         '../third_party/mesa/mesa.gyp:osmesa',
         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:copy_TestNetscapePlugIn',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'app/chrome_main_uitest.cc',
         'browser/browser_encoding_uitest.cc',
         'browser/custom_handlers/custom_handlers_uitest.cc',
         'browser/download/save_page_uitest.cc',
-        'browser/default_plugin_uitest.cc',
         'browser/fast_shutdown_uitest.cc',
         'browser/history/multipart_uitest.cc',
         'browser/history/redirect_uitest.cc',
         'browser/iframe_uitest.cc',
         'browser/images_uitest.cc',
         'browser/locale_tests_uitest.cc',
         'browser/media_uitest.cc',
         'browser/metrics/metrics_service_uitest.cc',
         'browser/net/load_timing_observer_uitest.cc',
         'browser/prefs/pref_service_uitest.cc',
@@ skipping 75 matching lines @@
         }],
         ['toolkit_views==1', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
         }],
         ['use_aura==1', {
           'sources!': [
             'test/automation/automation_proxy_uitest.cc',
             'test/ui/npapi_uitest.cc',
+            'browser/default_plugin_uitest.cc',

[jochen (gone - plz use gerrit), 2011/11/24 13:17:38]

not sure I understand this. You deleted the entry above, and you also put it on
the exclusion list for aura?

Shouldn't you put it on the inclusion list for not-aura?

[Bernhard Bauer, 2011/11/24 13:53:05]

True, that seems like one too many ;-) I think the more common pattern is to
list it under sources, then exclude it conditionally, so I'm going with that
now.

           ],
           'dependencies': [
             '../ui/aura/aura.gyp:aura',
           ],
         }],
         ['OS=="mac"', {
           # See the comment in this section of the unit_tests target for an
           # explanation (crbug.com/43791 - libwebcore.a is too large to mmap).
           'dependencies+++': [
             '../third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore',
@@ skipping 11 matching lines @@
             'security_tests',  # run time dependency
             'test_support_common',
             '../google_update/google_update.gyp:google_update',
           ],
           'conditions': [
             ['win_use_allocator_shim==1', {
               'dependencies': [
                 '<(allocator_target)',
               ],
             }],
+            ['use_aura==0', {
+              'dependencies': [
+                # Runtime dependency
+                'default_plugin/default_plugin.gyp:default_plugin',
+              ]
+            }],
           ],
           'link_settings': {
             'libraries': [
               '-lOleAcc.lib',
             ],
           },
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
                 'VCLinkerTool': {
@@ skipping 3455 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'
 }