Cleaning up after the initial Chrome Frame commit.

chrome/installer/installer.gyp

 {
   'variables': {
     'version_py': '../../chrome/tools/build/version.py',
     'version_path': '../../chrome/VERSION',
     'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
     # 'branding_dir' is set in the 'conditions' section at the bottom.
   },
   'conditions': [
     ['OS=="win"', {
       'targets': [
@@ skipping 13 matching lines @@
             '../../third_party/icu/icu.gyp:icuuc',
             '../../third_party/libxml/libxml.gyp:libxml',
             '../../third_party/lzma_sdk/lzma_sdk.gyp:lzma_sdk',
           ],
           'include_dirs': [
             '../..',
           ],
           'sources': [
             'util/browser_distribution.cc',
             'util/browser_distribution.h',
+            'util/chrome_frame_distribution.cc',
+            'util/chrome_frame_distribution.h',
             'util/compat_checks.cc',
             'util/compat_checks.h',
             'util/copy_tree_work_item.cc',
             'util/copy_tree_work_item.h',
             'util/create_dir_work_item.cc',
             'util/create_dir_work_item.h',
             'util/create_reg_key_work_item.cc',
             'util/create_reg_key_work_item.h',
             'util/delete_reg_value_work_item.cc',
             'util/delete_reg_value_work_item.h',
@@ skipping 29 matching lines @@
             'util/shell_util.h',
             'util/util_constants.cc',
             'util/util_constants.h',
             'util/version.cc',
             'util/version.h',
             'util/work_item.cc',
             'util/work_item.h',
             'util/work_item_list.cc',
             'util/work_item_list.h',
           ],
-          'variables': {
-            'extra_installer_util_sources%': 0,
-          },
-          'conditions': [
-            ['extra_installer_util_sources', {
-                'sources': [
-                  'util/exp/experimental_browser_distribution.cc',
-                  'util/exp/experimental_browser_distribution.h',
-                ],
-              },
-            ],
-          ],
         },
         {
           'target_name': 'gcapi_dll',
           'type': 'loadable_module',
           'msvs_guid': 'B802A2FE-E4E2-4F5A-905A-D5128875C954',
           'dependencies': [
             '../../google_update/google_update.gyp:google_update',
           ],
           'include_dirs': [
             '../..',
@@ skipping 516 matching lines @@
       'variables': {
          'branding_dir': '../app/theme/google_chrome',
       },
     }, { # else branding!="Chrome"
       'variables': {
          'branding_dir': '../app/theme/chromium',
       },
     }],
   ],
 }