Use BRANDING for IE CEEE. Simplify chrome_dll_version handling.

chrome/chrome_tests.gypi

 # Copyright (c) 2010 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' : {
     'pyautolib_sources': [
       'app/chrome_command_ids.h',
       'app/chrome_dll_resource.h',
       'common/automation_constants.h',
@@ skipping 10 matching lines @@
       # This target contains mocks and test utilities that don't belong in
       # production libraries but are used by more than one test executable.
       'target_name': 'test_support_common',
       'type': '<(library)',
       'dependencies': [
         'browser',
         'common',
         'renderer',
         'chrome_resources',
         'chrome_strings',
+        'browser/policy/proto/device_management_proto.gyp:device_management_proto_cpp',

[robertshield, 2010/11/26 11:45:05]

This looks like a merge artifact, please confirm that it is intentional.

[Jói, 2010/11/26 11:59:07]

It's intentional, see the last line of the check-in description, "Also added a
missing dependency to the 'test_support_common' target, that I discovered when
doing a clobber build on the trybots. "

Looks like before this, any clobber build would be broken on tip of tree,
although it's possible that it was succeeding by fluke before my other GYP
changes. The error I was seeing is at
http://build.chromium.org/p/tryserver.chromium/builders/win/builds/4473/steps...

         'browser/sync/protocol/sync_proto.gyp:sync_proto_cpp',
         'theme_resources',
         '../base/base.gyp:test_support_base',
         '../skia/skia.gyp:skia',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
       ],
       'export_dependent_settings': [
         'renderer',
       ],
@@ skipping 335 matching lines @@
           'dependencies': [
             '../views/views.gyp:views',
           ],
         }],
         ['OS=="win"', {
           'include_dirs': [
             '../third_party/wtl/include',
           ],
           'dependencies': [
             '../app/app.gyp:app_resources',
-            'chrome.gyp:chrome_dll_version',
+            'chrome.gyp:chrome_version_header',
             'chrome.gyp:crash_service',  # run time dependency
             'chrome.gyp:installer_util_strings',
             '../sandbox/sandbox.gyp:sandbox',
             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
           ],
           'sources': [
             '../webkit/glue/resources/aliasb.cur',
             '../webkit/glue/resources/cell.cur',
             '../webkit/glue/resources/col_resize.cur',
             '../webkit/glue/resources/copy.cur',
             '../webkit/glue/resources/row_resize.cur',
             '../webkit/glue/resources/vertical_text.cur',
             '../webkit/glue/resources/zoom_in.cur',
             '../webkit/glue/resources/zoom_out.cur',
 
             'app/chrome_dll.rc',
+            'app/chrome_dll_version.rc',
             'test/data/resource.rc',
 
             # TODO:  It would be nice to have these pulled in
             # automatically from direct_dependent_settings in
             # their various targets (net.gyp:net_resources, etc.),
             # but that causes errors in other targets when
             # resulting .res files get referenced multiple times.
             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
@@ skipping 273 matching lines @@
         'test/webdriver/commands/create_session.h',
         'test/webdriver/commands/create_session.cc',
         'test/webdriver/commands/execute_command.h',
         'test/webdriver/commands/execute_command.cc',
         'test/webdriver/commands/navigate_commands.h',
         'test/webdriver/commands/navigate_commands.cc',
         'test/webdriver/commands/response.h',
         'test/webdriver/commands/session_with_id.h',
         'test/webdriver/commands/session_with_id.cc',
         'test/webdriver/commands/source_command.h',
-        'test/webdriver/commands/source_command.cc',        
+        'test/webdriver/commands/source_command.cc',
         'test/webdriver/commands/speed_command.h',
         'test/webdriver/commands/speed_command.cc',
         'test/webdriver/commands/title_command.h',
         'test/webdriver/commands/title_command.cc',
         'test/webdriver/commands/url_command.h',
         'test/webdriver/commands/url_command.cc',
         'test/webdriver/commands/webdriver_command.h',
         'test/webdriver/commands/webdriver_command.cc',
       ],
       'conditions': [
@@ skipping 282 matching lines @@
       'defines': [
         'CLD_WINDOWS',
       ],
       'direct_dependent_settings': {
         'defines': [
           'CLD_WINDOWS',
         ],
       },
       'sources': [
         'app/breakpad_mac_stubs.mm',
-        'app/chrome_dll.rc',
         # All unittests in browser, common, renderer and service.
         'browser/about_flags_unittest.cc',
         'browser/accessibility/browser_accessibility_mac_unittest.mm',
         'browser/accessibility/browser_accessibility_win_unittest.cc',
         'browser/app_controller_mac_unittest.mm',
         'browser/autocomplete_history_manager_unittest.cc',
         'browser/autocomplete/autocomplete_edit_unittest.cc',
         'browser/autocomplete/autocomplete_edit_view_mac_unittest.mm',
         'browser/autocomplete/autocomplete_popup_view_gtk_unittest.cc',
         'browser/autocomplete/autocomplete_popup_view_mac_unittest.mm',
@@ skipping 782 matching lines @@
           'dependencies': [
             'convert_dict_lib',
             '../third_party/hunspell/hunspell.gyp:hunspell',
           ],
           'sources!': [
             'browser/spellchecker_platform_engine_unittest.cc',
           ],
         }],
         ['OS=="win"', {
           'dependencies': [
-            'chrome_dll_version',
+            'chrome_version_header',
             'installer_util_strings',
             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
             '../third_party/isimpledom/isimpledom.gyp:isimpledom',
             'test_chrome_plugin',  # run time dependency
           ],
           'conditions': [
             ['win_use_allocator_shim==1', {
               'dependencies': [
                 '<(allocator_target)',
               ],
             }],
           ],
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
           'sources': [
+            'app/chrome_dll.rc',
+            'app/chrome_dll_version.rc',
+
             # TODO:  It would be nice to have these pulled in
             # automatically from direct_dependent_settings in
             # their various targets (net.gyp:net_resources, etc.),
             # but that causes errors in other targets when
             # resulting .res files get referenced multiple times.
             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
@@ skipping 16 matching lines @@
                 'VCLinkerTool': {
                   # Forcing incremental build off to try to avoid incremental
                   # linking errors on 64-bit bots too. http://crbug.com/52555
                   'LinkIncremental': '1',
                 },
               },
             },
           },
         }, { # else: OS != "win"
           'sources!': [
-            'app/chrome_dll.rc',
             'browser/accessibility/browser_accessibility_win_unittest.cc',
             'browser/bookmarks/bookmark_codec_unittest.cc',
             'browser/bookmarks/bookmark_drag_data_unittest.cc',
             'browser/chrome_plugin_unittest.cc',
             'browser/extensions/extension_process_manager_unittest.cc',
             'browser/login_prompt_unittest.cc',
             'browser/rlz/rlz_unittest.cc',
             'browser/search_engines/template_url_scraper_unittest.cc',
             'browser/ui/views/bookmark_editor_view_unittest.cc',
             'browser/ui/views/extensions/browser_action_drag_data_unittest.cc',
@@ skipping 44 matching lines @@
         '../third_party/icu/icu.gyp:icuuc',
         # Runtime dependencies
         'chrome_mesa',
       ],
       'include_dirs': [
         '..',
       ],
       'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
       'sources': [
         'app/breakpad_mac_stubs.mm',
-        'app/chrome_command_ids.h',
-        'app/chrome_dll.rc',
-        'app/chrome_dll_resource.h',
-        'app/chrome_dll_version.rc.version',
         'browser/autocomplete/autocomplete_browsertest.cc',
         'browser/browser_browsertest.cc',
         'browser/browsing_data_database_helper_browsertest.cc',
         'browser/browsing_data_local_storage_helper_browsertest.cc',
         'browser/child_process_security_policy_browsertest.cc',
         'browser/chromeos/cros/cros_in_process_browser_test.cc',
         'browser/chromeos/cros/cros_in_process_browser_test.h',
         'browser/chromeos/cros/cros_mock.cc',
         'browser/chromeos/cros/cros_mock.h',
         'browser/chromeos/cros/mock_cros_library.h',
@@ skipping 192 matching lines @@
           ],
         }],
         ['OS!="linux" or toolkit_views==1', {
           'sources!': [
             'browser/extensions/browser_action_test_util_gtk.cc',
             'browser/gtk/view_id_util_browsertest.cc',
           ],
         }],
         ['OS=="win"', {
           'sources': [
+            'app/chrome_command_ids.h',
+            'app/chrome_dll_resource.h',
+            'app/chrome_dll.rc',
+            'app/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
           ],
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
           'dependencies': [
-            'chrome_dll_version',
+            'chrome_version_header',
             'installer_util_strings',
             '../sandbox/sandbox.gyp:sandbox',
           ],
           'conditions': [
             ['win_use_allocator_shim==1', {
               'dependencies': [
                 '<(allocator_target)',
               ],
             }],
           ],
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                 },
               },
             },
           }
         }, { # else: OS != "win"
           'sources!': [
-            'app/chrome_command_ids.h',
-            'app/chrome_dll.rc',
-            'app/chrome_dll_resource.h',
-            'app/chrome_dll_version.rc.version',
             'browser/extensions/extension_popup_apitest.cc',
             'browser/extensions/extension_rlz_apitest.cc',
             # TODO(jam): http://crbug.com/15101 These tests fail on Linux and
             # Mac.
             'browser/child_process_security_policy_browsertest.cc',
             'browser/renderer_host/test/web_cache_manager_browsertest.cc',
             'browser/renderer_host/test/render_view_host_manager_browsertest.cc',
           ],
         }],
         ['OS=="linux"', {
@@ skipping 74 matching lines @@
         '../skia/skia.gyp:skia',
         '../testing/gtest.gyp:gtest',
         # This is the safebrowsing test server.
         '../third_party/safe_browsing/safe_browsing.gyp:safe_browsing',
       ],
       'include_dirs': [
         '..',
       ],
       'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
       'sources': [
-        'app/chrome_dll.rc',
         'browser/safe_browsing/safe_browsing_test.cc',
         'test/in_process_browser_test.cc',
         'test/in_process_browser_test.h',
         'test/out_of_proc_test_runner.cc',
       ],
       'conditions': [
         ['OS=="win"', {
           'dependencies': [
-            'chrome_dll_version',
+            'chrome_version_header',
             'installer_util_strings',
             '../sandbox/sandbox.gyp:sandbox',
           ],
           'sources': [
+            'app/chrome_dll.rc',
+            'app/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
           ],
           'configurations': {
             'Debug_Base': {
               'msvs_settings': {
@@ skipping 426 matching lines @@
         '../third_party/WebKit/WebKit/chromium/WebKit.gyp:webkit',
       ],
       'include_dirs': [
         '..',
         '<(INTERMEDIATE_DIR)',
         '<(protoc_out_dir)',
       ],
       # TODO(phajdan.jr): Only temporary, to make transition easier.
       'defines': [ 'ALLOW_IN_PROC_BROWSER_TEST' ],
       'sources': [
-        'app/chrome_command_ids.h',
-        'app/chrome_dll.rc',
-        'app/chrome_dll_resource.h',
-        'app/chrome_dll_version.rc.version',
         'browser/autofill/autofill_common_test.cc',
         'browser/autofill/autofill_common_test.h',
         'browser/password_manager/password_form_data.cc',
         'browser/sessions/session_backend.cc',
         'browser/sessions/session_service_test_helper.cc',
         'browser/sync/glue/session_model_associator.cc',
         'test/bookmark_load_observer.h',
         'test/in_process_browser_test.cc',
         'test/in_process_browser_test.h',
         'test/out_of_proc_test_runner.cc',
@@ skipping 31 matching lines @@
         'test/live_sync/two_client_live_preferences_sync_test.cc',
         'test/live_sync/two_client_live_passwords_sync_test.cc',
         'test/live_sync/two_client_live_sessions_sync_test.cc',
         'test/live_sync/two_client_live_themes_sync_test.cc',
         'test/test_notification_tracker.cc',
         'test/test_notification_tracker.h',
         'test/testing_browser_process.h',
         'test/ui_test_utils_linux.cc',
         'test/ui_test_utils_mac.mm',
         'test/ui_test_utils_win.cc',
-        'test/data/resource.rc',
       ],
       'conditions': [
         # Plugin code.
         ['OS=="linux" or OS=="win"', {
           'dependencies': [
             'plugin',
            ],
           'export_dependent_settings': [
             'plugin',
           ],
         }],
         ['OS=="linux"', {
            'dependencies': [
              '../build/linux/system.gyp:gtk',
              '../build/linux/system.gyp:nss',
            ],
         }],
         ['OS=="mac"', {
           # See the comment in this section of the unit_tests target for an
           # explanation (crbug.com/43791 - libwebcore.a is too large to mmap).
           'dependencies+++': [
             '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
           ],
           # The sync_integration_tests do not run on mac without this flag.
           # Search for comments about "xcode_settings" elsewhere in this file.
           'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
         }],
         ['OS=="win"', {
           'sources': [
+            'app/chrome_command_ids.h',
+            'app/chrome_dll.rc',
+            'app/chrome_dll_resource.h',
+            'app/chrome_dll_version.rc',
+            'test/data/resource.rc',
             '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome_dll_version/chrome_dll_version.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
             '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources.rc',
           ],
           'include_dirs': [
             '<(DEPTH)/third_party/wtl/include',
           ],
           'dependencies': [
-            'chrome_dll_version',
+            'chrome_version_header',
             'installer_util_strings',
             '../sandbox/sandbox.gyp:sandbox',
           ],
           'conditions': [
             ['win_use_allocator_shim==1', {
               'dependencies': [
                 '<(allocator_target)',
               ],
             }],
           ],
           'configurations': {
             'Debug': {
               'msvs_settings': {
                 'VCLinkerTool': {
                   'LinkIncremental': '<(msvs_large_module_debug_link_mode)',
                 },
               },
             },
           },
-        }, { # else: OS != "win"
-          'sources!': [
-            'app/chrome_dll.rc',
-            'app/chrome_dll_version.rc.version',
-            'test/data/resource.rc',
-          ],
         }],
         ['toolkit_views==1', {
           'dependencies': [
             '../views/views.gyp:views',
           ],
         }],
       ],
     },
     {
       'target_name': 'plugin_tests',
@@ skipping 551 matching lines @@
       ]
     }],  # 'coverage!=0'
   ],  # 'conditions'
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: