Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

build/secondary/third_party/nss/BUILD.gn

Index: build/secondary/third_party/nss/BUILD.gn
diff --git a/build/secondary/third_party/nss/BUILD.gn b/build/secondary/third_party/nss/BUILD.gn
index ee5f112afc3c20dcfb8d4c6561a5d91c80d2ef01..768a85d87c95159fd25e1568671b67e92ed33dfd 100644
--- a/build/secondary/third_party/nss/BUILD.gn
+++ b/build/secondary/third_party/nss/BUILD.gn
@@ -217,10 +217,7 @@ if (is_linux) {
         "//build/config/win:lean_and_mean",  # Won"t compile with lean and mean.
       ]
     }
-    configs += [
-      "//build/config/compiler:no_chromium_code",
-      "//build/config/compiler:no_size_t_to_int_warning",
-    ]
+    configs += [ "//build/config/compiler:no_chromium_code" ]
 
     cflags = []
     defines = [
@@ -231,7 +228,10 @@ if (is_linux) {
     include_dirs = [ "nspr/pr/include/private" ]
 
     if (is_win) {
-      cflags = [ "/wd4554" ]  # Check precidence.
+      cflags = [
+        "/wd4554",  # Check precidence.
+        "/wd4267",  # Conversion from size_t to "type".
+      ]
       defines += [
         "XP_PC",
         "WIN32",
@@ -281,9 +281,9 @@ if (is_linux) {
       ]
     }
 
-    if (current_cpu == "x86") {
+    if (cpu_arch == "x86") {
       defines += [ "_X86_" ]
-    } else if (current_cpu == "x64") {
+    } else if (cpu_arch == "x64") {
       defines += [ "_AMD64_" ]
     }
 
@@ -474,7 +474,7 @@ if (is_linux) {
     ]
   }
 
-  if (is_win && current_cpu == "x86") {
+  if (is_win && cpu_arch == "x86") {
     source_set("nss_static_avx") {
       sources = [
         "nss/lib/freebl/intel-gcm-wrap.c",
@@ -882,10 +882,7 @@ if (is_linux) {
     if (is_win) {
       configs -= [ "//build/config/win:unicode" ]  # Requires 8-bit mode.
     }
-    configs += [
-      "//build/config/compiler:no_chromium_code",
-      "//build/config/compiler:no_size_t_to_int_warning",
-    ]
+    configs += [ "//build/config/compiler:no_chromium_code" ]
     public_configs = [ ":nss_static_config" ]
 
     cflags = []
@@ -904,7 +901,10 @@ if (is_linux) {
     ]
 
     if (is_win) {
-      cflags += [ "/wd4101" ]  # Unreferenced local variable.
+      cflags += [
+        "/wd4101",  # Unreferenced local variable.
+        "/wd4267",  # Conversion from size_t to "type".
+      ]
     }
 
     if (include_nss_libpkix) {
@@ -1094,7 +1094,7 @@ if (is_linux) {
       defines += [ "NSS_DISABLE_ROOT_CERTS" ]
     }
 
-    if (current_cpu == "x64" && !is_win) {
+    if (cpu_arch == "x64" && !is_win) {
       sources -= [
         "nss/lib/freebl/chacha20/chacha20.c",
         "nss/lib/freebl/poly1305/poly1305.c",
@@ -1139,7 +1139,7 @@ if (is_linux) {
         "WIN95",
       ]
 
-      if (current_cpu == "x86") {
+      if (cpu_arch == "x86") {
         defines += [
           "NSS_X86_OR_X64",
           "NSS_X86",
@@ -1153,7 +1153,7 @@ if (is_linux) {
           "INTEL_GCM",
         ]
         sources -= [ "nss/lib/freebl/mpi/mpi_amd64.c" ]
-      } else if (current_cpu == "x64") {
+      } else if (cpu_arch == "x64") {
         sources -= [
           "nss/lib/freebl/intel-aes-x86-masm.asm",
           "nss/lib/freebl/mpi/mpi_amd64.c",
@@ -1204,7 +1204,7 @@ if (is_linux) {
       "//third_party/sqlite",
     ]
 
-    if (is_win && current_cpu == "x86") {
+    if (is_win && cpu_arch == "x86") {
       deps += [ ":nss_static_avx" ]
     }
   }