Revert 148046 - Revert 147650 - Implement installation of the Chrome App Host.

chrome/chrome_installer.gypi

 # Copyright (c) 2012 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.
 
 {
   'variables': {
     'lastchange_path': '../build/util/LASTCHANGE',
     # 'branding_dir' is set in the 'conditions' section at the bottom.
   },
   'conditions': [
@@ skipping 70 matching lines @@
             '../content/content.gyp:content_common',
             '../testing/gmock.gyp:gmock',
             '../testing/gtest.gyp:gtest',
           ],
           'include_dirs': [
             '..',
           ],
           'sources': [
             'installer/setup/compat_checks_unittest.cc',
             'installer/setup/setup_constants.cc',
-            'installer/util/browser_distribution_unittest.cc',
             'installer/util/channel_info_unittest.cc',
             'installer/util/copy_reg_key_work_item_unittest.cc',
             'installer/util/copy_tree_work_item_unittest.cc',
             'installer/util/create_dir_work_item_unittest.cc',
             'installer/util/create_reg_key_work_item_unittest.cc',
             'installer/util/delete_after_reboot_helper_unittest.cc',
             'installer/util/delete_reg_key_work_item_unittest.cc',
             'installer/util/delete_reg_value_work_item_unittest.cc',
             'installer/util/delete_tree_work_item_unittest.cc',
             'installer/util/duplicate_tree_detector_unittest.cc',
@@ skipping 153 matching lines @@
           },
         },
         {
           'target_name': 'setup',
           'type': 'executable',
           'dependencies': [
             'installer_util',
             'installer_util_strings',
             '../base/base.gyp:base',
             '../build/temp_gyp/googleurl.gyp:googleurl',
+            '../chrome/chrome.gyp:common_constants',
             '../chrome_frame/chrome_frame.gyp:chrome_tab_idl',
             '../chrome_frame/chrome_frame.gyp:npchrome_frame',
             '../breakpad/breakpad.gyp:breakpad_handler',
             '../rlz/rlz.gyp:rlz_lib',
             '../third_party/zlib/zlib.gyp:zlib',
           ],
           'include_dirs': [
             '..',
             '<(INTERMEDIATE_DIR)',
             '<(SHARED_INTERMEDIATE_DIR)/setup',
@@ skipping 698 matching lines @@
                     '<(mac_packaging_sh_dir)',
                     '<(mac_product_name)',
                     '<(version_full)',
                   ],
                 },
               ],  # 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.
+                  # 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)',
@@ skipping 94 matching lines @@
          'branding_dir_100': 'app/theme/default_100_percent/google_chrome',
       },
     }, { # else branding!="Chrome"
       'variables': {
          'branding_dir': 'app/theme/chromium',
          'branding_dir_100': 'app/theme/default_100_percent/chromium',
       },
     }],
   ],
 }