Merge 241116 "Remove Chrome Frame quick-enable."

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',
     'libpeer_target_type%': 'static_library',
     # 'branding_dir' is set in the 'conditions' section at the bottom.
   },
@@ skipping 257 matching lines @@
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)/setup',
             ],
           },
           'sources': [
             'installer/mini_installer/chrome.release',
             'installer/setup/archive_patch_helper.cc',
             'installer/setup/archive_patch_helper.h',
             'installer/setup/cf_migration.cc',
             'installer/setup/cf_migration.h',
-            'installer/setup/chrome_frame_quick_enable.cc',
-            'installer/setup/chrome_frame_quick_enable.h',
             'installer/setup/install.cc',
             'installer/setup/install.h',
             'installer/setup/install_worker.cc',
             'installer/setup/install_worker.h',
             'installer/setup/setup_main.cc',
             'installer/setup/setup_main.h',
             'installer/setup/setup.ico',
             'installer/setup/setup.rc',
             'installer/setup/setup_constants.cc',
             'installer/setup/setup_constants.h',
@@ skipping 932 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',
       },
     }],
   ],
 }