Update existing uses of /wd4267 to use the GN config

This is the size_t to integer conversion warning. Using the config prevents flag duplication and is clearer to read.

Minor updates to Win64 build, including some fixes for size_t to int conversions.

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

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

5 files changed, 15 insertions, 24 deletions

diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn
index b1e69d27..202469a 100644
--- a/extensions/BUILD.gn
+++ b/extensions/BUILD.gn
@@ -70,6 +70,8 @@ source_set("test_support") {
   sources = rebase_path(extensions_gypi_values.extensions_test_support_sources,
                         ".",
                         "//extensions")
+  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
   deps = [
     ":extensions_resources",
@@ -90,10 +92,6 @@ source_set("test_support") {
     "//content/public/browser",
     "//extensions/common/api/cast_channel:cast_channel_proto",
   ]
-
-  if (is_win) {
-    cflags = [ "/wd4267" ]  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-  }
 }
 
 # GYP version: //extensions/extensions.gyp:extensions_shell_and_test_pak
diff --git a/extensions/browser/BUILD.gn b/extensions/browser/BUILD.gn
index a2b49b8..4659457 100644
--- a/extensions/browser/BUILD.gn
+++ b/extensions/browser/BUILD.gn
@@ -30,6 +30,9 @@ source_set("browser") {
     "//third_party/re2",
   ]
 
+  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
+
   if (enable_extensions) {
     # Includes all API implementations and the ExtensionsApiClient
     # interface. Moving an API from src/chrome to src/extensions implies
@@ -97,8 +100,4 @@ source_set("browser") {
       }
     }
   }
-
-  if (is_win) {
-    cflags = [ "/wd4267" ]  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-  }
 }
diff --git a/extensions/common/BUILD.gn b/extensions/common/BUILD.gn
index faa1cb8..3cd8117 100644
--- a/extensions/common/BUILD.gn
+++ b/extensions/common/BUILD.gn
@@ -13,10 +13,8 @@ source_set("common_constants") {
       rebase_path(extensions_gypi_values.extensions_common_constants_sources,
                   ".",
                   "//extensions")
-
-  if (is_win) {
-    cflags = [ "/wd4267" ]  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-  }
+  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 }
 
 if (enable_extensions) {
@@ -31,6 +29,8 @@ if (enable_extensions) {
     sources = rebase_path(extensions_gypi_values.extensions_common_sources,
                           ".",
                           "//extensions")
+    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+    configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
     deps = [
       ":common_constants",
@@ -81,9 +81,5 @@ if (enable_extensions) {
                       "//extensions")
       sources += nacl_sources
     }
-
-    if (is_win) {
-      cflags = [ "/wd4267" ]  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    }
   }
 }  # enable_extensions
diff --git a/extensions/renderer/BUILD.gn b/extensions/renderer/BUILD.gn
index a35e723..1bfceef 100644
--- a/extensions/renderer/BUILD.gn
+++ b/extensions/renderer/BUILD.gn
@@ -13,6 +13,9 @@ source_set("renderer") {
                         ".",
                         "//extensions")
 
+  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
+
   deps = [
     "//chrome:resources",
     "//content:resources",
@@ -22,8 +25,4 @@ source_set("renderer") {
     "//third_party/WebKit/public:blink",
     "//third_party/mojo/src/mojo/edk/js",
   ]
-
-  if (is_win) {
-    cflags = [ "/wd4267" ]  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-  }
 }
diff --git a/extensions/utility/BUILD.gn b/extensions/utility/BUILD.gn
index 1662c08..52f9d83 100644
--- a/extensions/utility/BUILD.gn
+++ b/extensions/utility/BUILD.gn
@@ -13,13 +13,12 @@ source_set("utility") {
                         ".",
                         "//extensions")
 
+  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
+  configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
+
   deps = [
     "//content/public/utility",
     "//extensions/common",
     "//skia",
   ]
-
-  if (is_win) {
-    cflags = [ "/wd4267" ]  # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-  }
 }