Cleaning up after the initial Chrome Frame commit.

build/common.gypi

 # Copyright (c) 2009 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   'variables': {
     # .gyp files should set chromium_code to 1 if they build Chromium-specific
@@ skipping 96 matching lines @@
     # but you can override this with "gyp -Dlibrary=shared_library" or you
     # can add the following line (without the #) to ~/.gyp/include.gypi
     # {'variables': {'library': 'shared_library'}}
     # to compile as shared by default
     'library%': 'static_library',
 
     # The Google Update appid.
     'google_update_appid%': '{8A69D345-D564-463c-AFF1-A69D9E530F96}',
 
     # Whether to add the experimental build define.
-    'experimental_build_define%': 0,
+    'chrome_frame_define%': 0,
 
     # TODO(bradnelson): eliminate this when possible.
     # To allow local gyp files to prevent release.vsprops from being included.
     # Yes(1) means include release.vsprops.
     # Once all vsprops settings are migrated into gyp, this can go away.
     'msvs_use_common_release%': 1,
 
     # TODO(bradnelson): eliminate this when possible.
     # To allow local gyp files to override additional linker options for msvs.
     # Yes(1) means set use the common linker options.
@@ skipping 99 matching lines @@
       'release_extra_cflags%': '',
       'debug_extra_cflags%': '',
       'release_valgrind_build%': 0,
     },
     'conditions': [
       ['branding=="Chrome"', {
         'defines': ['GOOGLE_CHROME_BUILD'],
       }, {  # else: branding!="Chrome"
         'defines': ['CHROMIUM_BUILD'],
       }],
-      ['experimental_build_define', {
-        'defines': ['CHROME_EXP_BUILD'],
+      ['chrome_frame_define', {
+        'defines': ['CHROME_FRAME_BUILD'],
       }],
       ['toolkit_views==1', {
         'defines': ['TOOLKIT_VIEWS=1'],
       }],
       ['chromeos==1', {
         'defines': ['OS_CHROMEOS=1'],
       }],
       ['selinux==1', {
         'defines': ['CHROMIUM_SELINUX=1'],
       }],
@@ skipping 609 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }