Add a GN flag for the Windows multi-dll build.

chrome/test/BUILD.gn

 # Copyright 2014 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.
 
+import("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//build/module_args/v8.gni")
 import("//testing/test.gni")
 
 # This target exists to reference other test executables to bring these files
 # into the build.
 group("test") {
   testonly = true
@@ skipping 351 matching lines @@
               chrome_tests_gypi_values.chrome_interactive_ui_test_non_linux_and_chromeos_sources,
               ".",
               "//chrome")
     }
 
     if (is_win) {
       sources += rebase_path(
               chrome_tests_gypi_values.chrome_interactive_ui_test_win_sources,
               ".",
               "//chrome")
-      sources += [ "$root_gen_dir/chrome/other_version.rc" ]
       deps += [
-        "//chrome:chrome_version_resources",
+        "//chrome:other_version",
         "//third_party/isimpledom",
         "//third_party/wtl",
         "//ui/resources",
       ]
 
       configs -= [ "//build/config/win:default_incremental_linking" ]
       configs +=
           [ "//build/config/win:default_large_module_incremental_linking" ]
     }
 
@@ skipping 450 matching lines @@
     if (!enable_webrtc) {
       sources -= [
         "../browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc",
         "../browser/extensions/api/webrtc_logging_private/webrtc_logging_private_apitest.cc",
         "../browser/media/chrome_webrtc_browsertest.cc",
         "../browser/media/chrome_webrtc_disable_encryption_flag_browsertest.cc",
         "../browser/media/chrome_webrtc_getmediadevices_browsertest.cc",
       ]
     }
     if (is_win) {
-      sources += [ "$root_gen_dir/chrome/other_version.rc" ]
       deps += [
-        "//chrome:chrome_version_resources",
+        "//chrome:other_version",
         "//third_party/wtl",
         "//ui/resources",
       ]
     } else {
       sources -= [
         "../app/chrome_command_ids.h",
         "../app/chrome_dll_resource.h",
         "../app/chrome_version.rc.version",
         "../browser/media_galleries/fileapi/iapps_finder_impl_win_browsertest.cc",
       ]
@@ skipping 201 matching lines @@
         "../browser/sync/test/integration/multiple_client_dictionary_sync_test.cc",
         "../browser/sync/test/integration/single_client_dictionary_sync_test.cc",
         "../browser/sync/test/integration/two_client_dictionary_sync_test.cc",
       ]
 
       # The sync_integration_tests do not run on mac without this flag.
       # Search for comments about "xcode_settings" elsewhere in this file.
       ldflags = [ "-Wl,-ObjC" ]
     }
     if (is_win) {
-      sources += [ "$root_gen_dir/chrome/other_version.rc" ]
       deps += [
-        "//chrome:chrome_version_resources",
+        "//chrome:other_version",
         "//third_party/wtl",
         "//ui/resources",
       ]
 
       configs -= [ "//build/config/win:default_incremental_linking" ]
       configs +=
           [ "//build/config/win:default_large_module_incremental_linking" ]
     } else {
       sources -= [ "../app/chrome_version.rc.version" ]
     }
@@ skipping 46 matching lines @@
 
     if (is_mac) {
       # Dictionary sync is disabled on Mac.
       sources -= [ "../browser/sync/test/integration/performance/dictionary_sync_perf_test.cc" ]
 
       # The sync_performance_tests do not run on mac without this flag.
       # Search for comments about "xcode_settings" elsewhere in this file.
       ldflags = [ "-Wl,-ObjC" ]
     }
     if (is_win) {
-      sources += [ "$root_gen_dir/chrome/other_version.rc" ]
       deps += [
-        "//chrome:chrome_version_resources",
+        "//chrome:other_version",
+        "//chrome/installer/util:strings",
         "//third_party/wtl",
         "//ui/resources",
       ]
       configs -= [ "//build/config/win:default_incremental_linking" ]
       configs +=
           [ "//build/config/win:default_large_module_incremental_linking" ]
     } else {
       sources -= [ "../app/chrome_version.rc.version" ]
     }
 
@@ skipping 434 matching lines @@
     if (is_win) {
       if (!is_component_build) {
         # Unit_tests pdb files can get too big when incremental linking is
         # on, disabling for this target.
         #'LinkIncremental': '<(msvs_debug_link_nonincremental)',  TODO(GYP)
       }
 
       sources += rebase_path(unit_gypi_values.chrome_unit_tests_win_sources,
                              ".",
                              "//chrome")
-      sources += [
-        # 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)/chrome_version/other_version.rc',  TODO(GYP)
-        #'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc',  TODO(GYP)
-      ]
-
       deps += [
         #'browser/safe_browsing/incident_reporting/verifier_test/verifier_unittest.gyp:verifier_test_dll_1',  TODO(GYP)
         #'browser/safe_browsing/incident_reporting/verifier_test/verifier_unittest.gyp:verifier_test_dll_2',  TODO(GYP)
-        #'chrome_version_resources',  TODO(GYP)
+        "//chrome:other_version",
         "//chrome_elf:blacklist_test_dll_1",
         "//chrome/installer/util:strings",
         "//third_party/iaccessible2",
         "//third_party/isimpledom",
         "//third_party/wtl",
+        "//ui/resources",
       ]
 
       configs -= [ "//build/config/win:default_incremental_linking" ]
       configs +=
           [ "//build/config/win:default_large_module_incremental_linking" ]
 
       libs = [
         "comsupp.lib",
         "oleacc.lib",
         "rpcrt4.lib",
@@ skipping 125 matching lines @@
       }
 
       if (cld_version == 0 || cld_version == 2) {
         # Use whatever CLD2 data access mode that the
         # application embedder is using.
         deps += [ "//third_party/cld_2:cld2_platform_impl" ]
       }
     }
   }
 }