Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

build/secondary/third_party/nss/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/linux/pkg_config.gni")
 
 if (is_linux) {
   # This is a dependency on NSS with no libssl. On Linux we use a built-in SSL
   # library but the system NSS libraries. Non-Linux platforms using NSS use the
   # hermetic one in //third_party/nss.
@@ skipping 199 matching lines @@
 
     public_configs = [ ":nspr_config" ]
 
     configs -= [ "//build/config/compiler:chromium_code" ]
     if (is_win) {
       configs -= [
         "//build/config/win:unicode",  # Requires 8-bit mode.
         "//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 = [
       "_NSPR_BUILD_",
       "FORCE_PR_LOG",
     ]
 
     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",
         "WIN95",
         "_PR_GLOBAL_THREADS_ONLY",
         "_CRT_SECURE_NO_WARNINGS",
       ]
     } else {
       sources -= [
         "nspr/pr/src/md/windows/ntgc.c",
@@ skipping 29 matching lines @@
         "nspr/pr/src/md/unix/uxrng.c",
         "nspr/pr/src/md/unix/uxshm.c",
         "nspr/pr/src/md/unix/uxwrap.c",
         "nspr/pr/src/pthreads/ptio.c",
         "nspr/pr/src/pthreads/ptmisc.c",
         "nspr/pr/src/pthreads/ptsynch.c",
         "nspr/pr/src/pthreads/ptthread.c",
       ]
     }
 
-    if (current_cpu == "x86") {
+    if (cpu_arch == "x86") {
       defines += [ "_X86_" ]
-    } else if (current_cpu == "x64") {
+    } else if (cpu_arch == "x64") {
       defines += [ "_AMD64_" ]
     }
 
     if (is_mac || is_ios) {
       sources -= [
         "nspr/pr/src/io/prdir.c",
         "nspr/pr/src/io/prfile.c",
         "nspr/pr/src/io/prio.c",
         "nspr/pr/src/io/prsocket.c",
         "nspr/pr/src/misc/pripcsem.c",
@@ skipping 170 matching lines @@
       "nss/lib/nss",
       "nss/lib/pk11wrap",
       "nss/lib/pkcs7",
       "nss/lib/pki",
       "nss/lib/smime",
       "nss/lib/softoken",
       "nss/lib/util",
     ]
   }
 
-  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",
         "nss/lib/freebl/intel-gcm-x86-masm.asm",
         "nss/lib/freebl/intel-gcm.h",
       ]
       defines = [
         "_WINDOWS",
         "_X86_",
         "INTEL_GCM",
@@ skipping 387 matching lines @@
       "nss/lib/freebl/win_rand.c",
 
       # debug_module.c is included by pk11load.c.
       "nss/lib/pk11wrap/debug_module.c",
     ]
 
     configs -= [ "//build/config/compiler:chromium_code" ]
     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 = []
 
     # Only need the defines and includes not in nss_static_config.
     defines = [
       "MP_API_COMPATIBLE",
       "NSS_DISABLE_DBM",
       "RIJNDAEL_INCLUDE_TABLES",
       "SHLIB_VERSION=\"3\"",
       "SOFTOKEN_SHLIB_VERSION=\"3\"",
     ]
     include_dirs = [
       "nss/lib/freebl/mpi",
       "nss/lib/ssl",
     ]
 
     if (is_win) {
-      cflags += [ "/wd4101" ]  # Unreferenced local variable.
+      cflags += [
+        "/wd4101",  # Unreferenced local variable.
+        "/wd4267",  # Conversion from size_t to "type".
+      ]
     }
 
     if (include_nss_libpkix) {
       sources += [
         "nss/lib/certhigh/certvfypkix.c",
         "nss/lib/certhigh/certvfypkixprint.c",
         "nss/lib/libpkix/include/pkix.h",
         "nss/lib/libpkix/include/pkix_certsel.h",
         "nss/lib/libpkix/include/pkix_certstore.h",
         "nss/lib/libpkix/include/pkix_checker.h",
@@ skipping 169 matching lines @@
         "nss/lib/libpkix/pkix_pl_nss/system",
       ]
     } else {
       defines += [ "NSS_DISABLE_LIBPKIX" ]
     }
 
     if (!include_nss_root_certs) {
       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",
       ]
     } else {
       sources -= [
         "nss/lib/freebl/chacha20/chacha20_vec.c",
         "nss/lib/freebl/poly1305/poly1305-donna-x64-sse2-incremental-source.c",
       ]
     }
@@ skipping 24 matching lines @@
     if (is_win) {
       defines += [
         "SHLIB_SUFFIX=\"dll\"",
         "SHLIB_PREFIX=\"\"",
         "SOFTOKEN_LIB_NAME=\"softokn3.dll\"",
         "XP_PC",
         "WIN32",
         "WIN95",
       ]
 
-      if (current_cpu == "x86") {
+      if (cpu_arch == "x86") {
         defines += [
           "NSS_X86_OR_X64",
           "NSS_X86",
           "_X86_",
           "MP_ASSEMBLY_MULTIPLY",
           "MP_ASSEMBLY_SQUARE",
           "MP_ASSEMBLY_DIV_2DX1D",
           "MP_USE_UINT_DIGIT",
           "MP_NO_MP_WORD",
           "USE_HW_AES",
           "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",
           "nss/lib/freebl/mpi/mpi_x86_asm.c",
         ]
         defines += [
           "NSS_USE_64",
           "NSS_X86_OR_X64",
           "NSS_X64",
           "_AMD64_",
@@ skipping 30 matching lines @@
     }
 
     public_deps = [
       ":nspr",
     ]
     deps = [
       ":nspr",
       "//third_party/sqlite",
     ]
 
-    if (is_win && current_cpu == "x86") {
+    if (is_win && cpu_arch == "x86") {
       deps += [ ":nss_static_avx" ]
     }
   }
 }  # Windows/Mac/iOS.