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

chrome/chrome_tests.gypi

Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index a1a4179b698a54883aa45285c06cd49218821cf4..f458d501273b391b9731422f67f7544ed160dec5 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -734,7 +734,6 @@
         '../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',
@@ -747,7 +746,6 @@
         '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',
@@ -843,6 +841,7 @@
           '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',
@@ -874,6 +873,12 @@
                 '<(allocator_target)',
               ],
             }],
+            ['use_aura==0', {
+              'dependencies': [
+                # Runtime dependency
+                'default_plugin/default_plugin.gyp:default_plugin',
+              ]
+            }],
           ],
           'link_settings': {
             'libraries': [