Merge 48978 to 375 - Include plugin.vch files for Flash Player (on official b...

chrome/chrome_exe.gypi

 # Copyright (c) 2009-2010 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': {
     'variables': {
       'chrome_exe_target': 0,
     },
     'target_conditions': [
@@ skipping 113 matching lines @@
   'targets': [
     {
       'target_name': 'chrome',
       'type': 'executable',
       'mac_bundle': 1,
       'msvs_guid': '7B219FAA-E360-43C8-B341-804A94EEFFAC',
       'variables': {
         'chrome_exe_target': 1,
       },
       'dependencies': [
-        # Copy a Flash Player binary to PRODUCT_DIR if applicable.
+        # Copy Flash Player files to PRODUCT_DIR if applicable.
         # Let the .gyp file decide what to do on a per-OS basis.
         '../third_party/adobe/flash/flash_player.gyp:flash_player',
       ],
       'conditions': [
         ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
           'actions': [
             {
               'action_name': 'manpage',
               'conditions': [
                 [ 'branding == "Chrome"', {
@@ skipping 242 matching lines @@
           'copies': [
             {
               'destination': '<(PRODUCT_DIR)/<(mac_product_name).app/Contents/Versions/<(version_full)',
               'files': [
                 '<(PRODUCT_DIR)/<(mac_product_name) Helper.app',
               ],
               'conditions': [
                 [ 'branding == "Chrome"', {
                   'files': [
                     '<(PRODUCT_DIR)/Flash Player Plugin for Chrome.plugin',
+                    '<(PRODUCT_DIR)/plugin.vch',
                   ],
                 }],
               ],
             },
           ],
           'postbuilds': [
             {
               'postbuild_name': 'Copy <(mac_product_name) Framework.framework',
               'action': [
                 'tools/build/mac/copy_framework_unversioned',
@@ skipping 126 matching lines @@
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],
 }