Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

third_party/yasm/BUILD.gn

Index: third_party/yasm/BUILD.gn
diff --git a/third_party/yasm/BUILD.gn b/third_party/yasm/BUILD.gn
index a09a4959a620f35f0b9f67c0c4a7847351583f9a..cd9b4532e6c8b1f9d052ac12702392d367288006 100644
--- a/third_party/yasm/BUILD.gn
+++ b/third_party/yasm/BUILD.gn
@@ -30,14 +30,18 @@
 if (current_toolchain == host_toolchain) {
   # Various files referenced by multiple targets.
   yasm_gen_include_dir = "$target_gen_dir/include"
-  config_makefile = "source/config/$host_os/Makefile"
+  yasm_os = os
+  if (is_chromeos) {
+    yasm_os = "linux"
+  }
+  config_makefile = "source/config/$yasm_os/Makefile"
   version_file = "version.mac"
 
   import("//build/compiled_action.gni")
 
   config("yasm_config") {
     include_dirs = [
-      "source/config/$host_os",
+      "source/config/$yasm_os",
       "source/patched-yasm",
     ]
     defines = [ "HAVE_CONFIG_H" ]
@@ -144,6 +148,8 @@ if (current_toolchain == host_toolchain) {
     # re2c is missing CLOSEVOP from one switch.
     if (is_posix) {
       cflags = [ "-Wno-switch" ]
+    } else if (is_win) {
+      cflags = [ "/wd4267" ]  # size_t to int conversion.
     }
   }
 
@@ -242,7 +248,9 @@ if (current_toolchain == host_toolchain) {
     # directory, but the gen_x86_insn.py script does not make this easy.
     include_dirs = [ yasm_gen_include_dir ]
 
-    if (!is_win) {
+    if (is_win) {
+      cflags = [ "/wd4267" ]  # size_t to int conversion.
+    } else {
       cflags = [
         "-ansi",
         "-pedantic",