Use BRANDING for IE CEEE. Simplify chrome_dll_version handling.

chrome/chrome.gyp

Index: chrome/chrome.gyp
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 7088b7f27a02b706de13dbd782311eb77698c8eb..ae48340d083a16037adff6822156b7d91dec22e6 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -1678,61 +1678,9 @@
           ],
         },
         {
-          'target_name': 'chrome_dll_version',
-          'type': 'none',
-          #'msvs_guid': '414D4D24-5D65-498B-A33F-3A29AD3CDEDC',
-          'dependencies': [
-            '../build/util/build_util.gyp:lastchange',
-          ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version',
-            ],
-          },
-          'actions': [
-            {
-              'action_name': 'version',
-              'variables': {
-                'lastchange_path':
-                  '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
-                'template_input_path': 'app/chrome_dll_version.rc.version',
-              },
-              'conditions': [
-                [ 'branding == "Chrome"', {
-                  'variables': {
-                     'branding_path': 'app/theme/google_chrome/BRANDING',
-                  },
-                }, { # else branding!="Chrome"
-                  'variables': {
-                     'branding_path': 'app/theme/chromium/BRANDING',
-                  },
-                }],
-              ],
-              'inputs': [
-                '<(template_input_path)',
-                '<(version_path)',
-                '<(branding_path)',
-                '<(lastchange_path)',
-              ],
-              'outputs': [
-                '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
-              ],
-              'action': [
-                'python',
-                '<(version_py_path)',
-                '-f', '<(version_path)',
-                '-f', '<(branding_path)',
-                '-f', '<(lastchange_path)',
-                '<(template_input_path)',
-                '<@(_outputs)',
-              ],
-              'message': 'Generating version information in <(_outputs)'
-            },
-          ],
-        },
-        {
           'target_name': 'chrome_version_header',
           'type': 'none',
+          'hard_dependency': 1,
           'dependencies': [
             '../build/util/build_util.gyp:lastchange',
           ],