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

chrome/chrome_common.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.
 
 {
   'targets': [
     {
       'target_name': 'common',
       'type': 'static_library',
       'variables': {
@@ skipping 14 matching lines @@
         # TODO(gregoryd): chrome_resources and chrome_strings could be
         #  shared with the 64-bit target, but it does not work due to a gyp
         # issue.
         'app/policy/cloud_policy_codegen.gyp:policy',
         'chrome_resources.gyp:chrome_resources',
         'chrome_resources.gyp:chrome_strings',
         'chrome_resources.gyp:theme_resources',
         'common_constants',
         'common_net',
         'common_version',
+        'default_plugin/default_plugin.gyp:default_plugin',
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
         '../base/base.gyp:base_static',
         '../build/temp_gyp/googleurl.gyp:googleurl',
         '../content/content.gyp:content_common',
         '../ipc/ipc.gyp:ipc',
         '../net/net.gyp:net',
         '../printing/printing.gyp:printing',
         '../skia/skia.gyp:skia',
         '../third_party/bzip2/bzip2.gyp:bzip2',
@@ skipping 194 matching lines @@
         'common/zip.h',
         'common/zip_internal.cc',
         'common/zip_internal.h',
         'common/zip_reader.cc',
         'common/zip_reader.h',
       ],
       'conditions': [
         ['OS=="win"', {
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
-          ]
-        }],
-        ['OS=="win" and use_aura==0', {
-          'dependencies': [
-            'default_plugin/default_plugin.gyp:default_plugin',
-          ]
+          ],
         }],
         ['toolkit_uses_gtk == 1', {
           'dependencies': [
             '../build/linux/system.gyp:gtk',
           ],
           'export_dependent_settings': [
             '../third_party/sqlite/sqlite.gyp:sqlite',
           ],
           'link_settings': {
             'libraries': [
               '-lX11',
               '-lXrender',
               '-lXss',
               '-lXext',
             ],
           },
+        },],
+        ['use_aura==1', {
+          'dependencies!': [
+           'default_plugin/default_plugin.gyp:default_plugin',
+          ],
         }],
         ['OS=="linux" and selinux==1', {
           'dependencies': [
             '../build/linux/system.gyp:selinux',
           ],
         }],
         ['OS=="mac"', {
           'dependencies': [
             '../third_party/mach_override/mach_override.gyp:mach_override',
           ],
@@ skipping 149 matching lines @@
         'common/safe_browsing/csd.proto'
       ],
       'variables': {
         'proto_in_dir': 'common/safe_browsing',
         'proto_out_dir': 'chrome/common/safe_browsing',
       },
       'includes': [ '../build/protoc.gypi' ],
     },
   ],
 }