Windows fixes for GN build.

R=scottmg@chromium.org

Review URL: https://codereview.chromium.org/498393002

Cr-Commit-Position: refs/heads/master@{#291749}

chrome/BUILD.gn

@@ -114,7 +114,7 @@ shared_library("main_dll") {
       "//chrome/app/theme:chrome_unscaled_resources",
       "//content/app/resources",
       "//crypto",
-      "//net:resources",
+      "//net:net_resources",
       "//third_party/wtl",
       "//ui/views",
       #'<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf' ]  TODO(GYP)
@@ -212,7 +212,9 @@ if (is_win) {
   # TODO(brettw) this duplicates "//chrome/common:version" which applies to
   # Linux.
   process_version("version_header") {
-    visibility = ":*"
+    # TODO(brettW) this should have more reduced visibility, but chrome/browser
+    # currently depends on this.
+    #visibility = ":*"
     source = "version.h.in"
     # TODO(brettw) this should move to $target_gen_dir/version.h and
     # source files including it should reference it via "chrome/version.h"

chrome/browser/ui/BUILD.gn

@@ -309,7 +309,7 @@ static_library("ui") {
     sources += rebase_path(gypi_values.chrome_browser_ui_win_sources,
                            ".", "//chrome")
     deps += [
-      "//chrome/browser/installer/util:strings",
+      "//chrome/installer/util:strings",
       "//third_party/wtl",
       "//third_party/iaccessible2",
       "//third_party/isimpledom",

third_party/libjingle/BUILD.gn

@@ -255,8 +255,8 @@ static_library("libjingle") {
   ]
 
   # From libjingle_common.gypi's conditions list.
-  if (is_win && !nacl_untrusted_build) {
-    cflags += [ "/wd4005", "\wd4267" ]
+  if (is_win) {
+    cflags = [ "/wd4005", "/wd4267" ]
   }
 
   forward_dependent_configs_from = [
@@ -337,7 +337,7 @@ source_set("peerconnnection_server") {
   ]
   if (is_win) {
     # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    cflags += [ "/wd4309" ]
+    cflags = [ "/wd4309" ]
   }
 }