Only copy keychain_reauthorize in official builds

chrome/chrome_installer.gypi

Index: chrome/chrome_installer.gypi
===================================================================
--- chrome/chrome_installer.gypi	(revision 141065)
+++ chrome/chrome_installer.gypi	(working copy)
@@ -926,6 +926,40 @@
                 },
               ],  # actions
             }],  # buildtype=="Official"
+            ['branding=="Chrome" and buildtype=="Official"', {
+              'actions': [
+                {
+		  # copy_keychain_reauthorize.sh explains why this isn't in a
+		  # 'copies' block, but briefly: this is a prebuilt signed
+		  # binary component that relies on a correct signature to
+		  # function properly, and a normal 'copies' block sadly makes
+		  # a trivial modification to the file such that its signature
+		  # is no longer valid.
+                  'action_name': 'Copy keychain_reauthorize',
+                  'variables': {
+                    'keychain_reauthorize_path': 'tools/build/mac/copy_keychain_reauthorize.sh',
+                    'keychain_reauthorize_normal_path': 'installer/mac/internal/keychain_reauthorize/com.google.Chrome',
+                    'keychain_reauthorize_canary_path': 'installer/mac/internal/keychain_reauthorize/com.google.Chrome.canary',
+                    'keychain_reauthorize_output_dir': '<(mac_packaging_dir)/.keychain_reauthorize',
+                  },
+                  'inputs': [
+                    '<(keychain_reauthorize_path)',
+                    '<(keychain_reauthorize_normal_path)',
+                    '<(keychain_reauthorize_canary_path)',
+                  ],
+                  'outputs': [
+                    '<(keychain_reauthorize_output_dir)/com.google.Chrome',
+                    '<(keychain_reauthorize_output_dir)/com.google.Chrome.canary',
+                  ],
+                  'action': [
+                    '<(keychain_reauthorize_path)',
+                    '<(keychain_reauthorize_output_dir)',
+                    '<(keychain_reauthorize_normal_path)',
+                    '<(keychain_reauthorize_canary_path)',
+                  ],
+                },
+              ],  # actions
+            }],  # branding=="Chrome" and buildtype=="Official"
           ],  # conditions
           'copies': [
             {
@@ -965,38 +999,6 @@
               ],  # conditions
             },
           ],  # copies
-          'actions': [
-            {
-              # copy_keychain_reauthorize.sh explains why this isn't in a
-              # 'copies' block, but briefly: this is a prebuilt signed binary
-              # component that relies on a correct signature to function
-              # properly, and a normal 'copies' block sadly makes a trivial
-              # modification to the file such that its signature is no longer
-              # valid.
-              'action_name': 'Copy keychain_reauthorize',
-              'variables': {
-                'keychain_reauthorize_path': 'tools/build/mac/copy_keychain_reauthorize.sh',
-                'keychain_reauthorize_normal_path': 'installer/mac/internal/keychain_reauthorize/com.google.Chrome',
-                'keychain_reauthorize_canary_path': 'installer/mac/internal/keychain_reauthorize/com.google.Chrome.canary',
-                'keychain_reauthorize_output_dir': '<(mac_packaging_dir)/.keychain_reauthorize',
-              },
-              'inputs': [
-                '<(keychain_reauthorize_path)',
-                '<(keychain_reauthorize_normal_path)',
-                '<(keychain_reauthorize_canary_path)',
-              ],
-              'outputs': [
-                '<(keychain_reauthorize_output_dir)/com.google.Chrome',
-                '<(keychain_reauthorize_output_dir)/com.google.Chrome.canary',
-              ],
-              'action': [
-                '<(keychain_reauthorize_path)',
-                '<(keychain_reauthorize_output_dir)',
-                '<(keychain_reauthorize_normal_path)',
-                '<(keychain_reauthorize_canary_path)',
-              ],
-            },
-          ],  # actions
         },  # target: installer_packaging
         {
           'target_name': 'gcapi_lib',