Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

third_party/boringssl/BUILD.gn

Index: third_party/boringssl/BUILD.gn
diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
index e14775476d5a14af71473b1a066fea43535bb1bb..d24586819e79f8c91067f8279d01b8e0af314e2e 100644
--- a/third_party/boringssl/BUILD.gn
+++ b/third_party/boringssl/BUILD.gn
@@ -28,9 +28,9 @@ gypi_values =
 if (is_win) {
   import("//third_party/yasm/yasm_assemble.gni")
   yasm_assemble("boringssl_asm") {
-    if (current_cpu == "x64") {
+    if (cpu_arch == "x64") {
       sources = gypi_values.boringssl_win_x86_64_sources
-    } else if (current_cpu == "x86") {
+    } else if (cpu_arch == "x86") {
       sources = gypi_values.boringssl_win_x86_sources
     }
   }
@@ -52,13 +52,7 @@ component("boringssl") {
   }
 
   configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [
-    "//build/config/compiler:no_chromium_code",
-
-    # TODO(davidben): Fix size_t truncations in BoringSSL.
-    # https://crbug.com/429039
-    "//build/config/compiler:no_size_t_to_int_warning",
-  ]
+  configs += [ "//build/config/compiler:no_chromium_code" ]
 
   # Also gets the include dirs from :openssl_config
   include_dirs = [
@@ -70,7 +64,13 @@ component("boringssl") {
     "src/crypto",
   ]
 
-  if (current_cpu == "x64") {
+  if (is_win) {
+    # TODO(davidben): Fix size_t truncations in BoringSSL.
+    # https://crbug.com/429039
+    cflags += [ "/wd4267" ]
+  }
+
+  if (cpu_arch == "x64") {
     if (is_mac) {
       sources += gypi_values.boringssl_mac_x86_64_sources
     } else if (is_linux || is_android) {
@@ -80,7 +80,7 @@ component("boringssl") {
     } else {
       defines += [ "OPENSSL_NO_ASM" ]
     }
-  } else if (current_cpu == "x86") {
+  } else if (cpu_arch == "x86") {
     if (is_mac) {
       sources += gypi_values.boringssl_mac_x86_sources
     } else if (is_linux || is_android) {
@@ -90,9 +90,9 @@ component("boringssl") {
     } else {
       defines += [ "OPENSSL_NO_ASM" ]
     }
-  } else if (current_cpu == "arm") {
+  } else if (cpu_arch == "arm") {
     sources += gypi_values.boringssl_linux_arm_sources
-  } else if (current_cpu == "arm64") {
+  } else if (cpu_arch == "arm64") {
     sources += gypi_values.boringssl_linux_aarch64_sources
   } else {
     defines += [ "OPENSSL_NO_ASM" ]