Revert "Fix chrome target in Windows GN 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/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
@@ skipping 266 matching lines @@
         sources += rebase_path(
                 gypi_values.chrome_interactive_ui_test_views_non_mac_sources,
                 ".",
                 "//chrome")
       }
       if (is_linux) {
         # TODO(gbillock): aura linux does not support the automation for
         # SendMouseMoveNotifyWhenDone
         sources -= [ "../browser/ui/views/toolbar/toolbar_button_test.cc" ]
       }
-      if (is_chromeos || !use_x11) {
+      if (is_chromeos) {
         sources -= [
           "../../ui/views/widget/desktop_aura/desktop_window_tree_host_x11_interactive_uitest.cc",
           "../../ui/views/widget/desktop_aura/x11_topmost_window_finder_interactive_uitest.cc",
         ]
       }
     }
 
     if (is_linux && !is_chromeos) {
       # Desktop linux.
       sources -= [
@@ skipping 62 matching lines @@
       sources += rebase_path(
               gypi_values.chrome_interactive_ui_test_non_linux_and_chromeos_sources,
               ".",
               "//chrome")
     }
 
     if (is_win) {
       sources += rebase_path(gypi_values.chrome_interactive_ui_test_win_sources,
                              ".",
                              "//chrome")
-      sources += [ "$root_gen_dir/chrome/other_version.rc" ]
+      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.
+        "$root_gen_dir/chrome/other_version.rc",
+        "$root_gen_dir/ui/resources/ui_unscaled_resources.rc",
+      ]
       deps += [
         "//chrome:chrome_version_resources",
         "//third_party/isimpledom",
         "//third_party/wtl",
         "//ui/resources",
       ]
     }
 
     if (is_mac) {
       datadeps = [
@@ skipping 443 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" ]
+      sources += [
+        "$root_gen_dir/chrome/other_version.rc",
+        "$root_gen_dir/ui/resources/ui_unscaled_resources.rc",
+      ]
       deps += [
         "//chrome:chrome_version_resources",
         "//third_party/wtl",
         "//ui/resources",
       ]
     } else {
       sources -= [
         "../app/chrome_command_ids.h",
         "../app/chrome_dll_resource.h",
         "../app/chrome_version.rc.version",
@@ skipping 208 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" ]
+      sources += [
+        "$root_gen_dir/chrome/other_version.rc",
+        "$root_gen_dir/ui/resources/ui_unscaled_resources.rc",
+      ]
       deps += [
         "//chrome:chrome_version_resources",
         "//third_party/wtl",
         "//ui/resources",
       ]
     } else {
       sources -= [ "../app/chrome_version.rc.version" ]
     }
     if (!is_chromeos) {
       sources -= [
@@ skipping 42 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" ]
+      sources += [
+        "$root_gen_dir/chrome/other_version.rc",
+        "$root_gen_dir/ui/resources/ui_unscaled_resources.rc",
+      ]
       deps += [
         "//chrome:chrome_version_resources",
         "//third_party/wtl",
         "//ui/resources",
       ]
     } else {
       sources -= [ "../app/chrome_version.rc.version" ]
     }
 
     if (toolkit_views) {
@@ skipping 17 matching lines @@
     # TODO(GYP) CDM adapter stuff.
     #if (enable_pepper_cdms) {
     #  deps += [
     #    "//media/cdm/ppapi:clearkeycdmadapter",
     #    "//ppapi:ppapi_cpp",
     #    "//third_party/widevine/cdm:adapter",
     #  ]
     #}
   }
 }