Update from https://crrev.com/304121

crypto/BUILD.gn

 # Copyright (c) 2013 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/crypto.gni")
 
 component("crypto") {
   output_name = "crcrypto"  # Avoid colliding with OpenSSL's libcrypto.
   sources = [
     "apple_keychain.h",
@@ skipping 106 matching lines @@
     sources -= [
       "capi_util.cc",
       "capi_util.h",
     ]
   }
 
   if (is_android) {
     deps += [ "//third_party/android_tools:cpu_features" ]
   }
 
-  if (is_win) {
-    # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-    cflags = [ "/wd4267" ]
-  }
-
   if (use_openssl) {
     # Remove NSS files when using OpenSSL
     sources -= [
       "ec_private_key_nss.cc",
       "ec_signature_creator_nss.cc",
       "encryptor_nss.cc",
       "hmac_nss.cc",
       "nss_util.cc",
       "nss_util.h",
       "nss_util_internal.h",
@@ skipping 24 matching lines @@
       "secure_hash_openssl.cc",
       "signature_creator_openssl.cc",
       "signature_verifier_openssl.cc",
       "symmetric_key_openssl.cc",
     ]
   }
 
   defines = [ "CRYPTO_IMPLEMENTATION" ]
 }
 
-if (is_win) {
+# TODO(GYP): TODO(dpranke), fix the compile errors for this stuff
+# and make it work.
+if (false && is_win) {
   # A minimal crypto subset for hmac-related stuff that small standalone
   # targets can use to reduce code size on Windows. This does not depend on
   # OpenSSL/NSS but will use Windows APIs for that functionality.
   source_set("crypto_minimal_win") {
     sources = [
       "crypto_export.h",
       "hmac.cc",
       "hmac.h",
       "hmac_win.cc",
       "scoped_capi_types.h",
       "scoped_nss_types.h",
       "secure_util.cc",
       "secure_util.h",
       "symmetric_key.h",
       "symmetric_key_win.cc",
       "third_party/nss/chromium-blapi.h",
       "third_party/nss/chromium-sha256.h",
       "third_party/nss/sha512.cc",
     ]
 
     deps = [
       "//base",
       "//base/third_party/dynamic_annotations",
     ]
 
     defines = [ "CRYPTO_IMPLEMENTATION" ]
   }
 }
 
-test("crypto_unittests") {
-  sources = [
-    # Tests.
-    "curve25519_unittest.cc",
-    "ec_private_key_unittest.cc",
-    "ec_signature_creator_unittest.cc",
-    "encryptor_unittest.cc",
-    "ghash_unittest.cc",
-    "hkdf_unittest.cc",
-    "hmac_unittest.cc",
-    "nss_util_unittest.cc",
-    "openssl_bio_string_unittest.cc",
-    "p224_unittest.cc",
-    "p224_spake_unittest.cc",
-    "random_unittest.cc",
-    "rsa_private_key_unittest.cc",
-    "rsa_private_key_nss_unittest.cc",
-    "secure_hash_unittest.cc",
-    "sha2_unittest.cc",
-    "signature_creator_unittest.cc",
-    "signature_verifier_unittest.cc",
-    "symmetric_key_unittest.cc",
-  ]
+# TODO(GYP): Make this link on win as well.
+if (!is_win) {
+  test("crypto_unittests") {
+    sources = [
+      # Tests.
+      "curve25519_unittest.cc",
+      "ec_private_key_unittest.cc",
+      "ec_signature_creator_unittest.cc",
+      "encryptor_unittest.cc",
+      "ghash_unittest.cc",
+      "hkdf_unittest.cc",
+      "hmac_unittest.cc",
+      "nss_util_unittest.cc",
+      "openssl_bio_string_unittest.cc",
+      "p224_unittest.cc",
+      "p224_spake_unittest.cc",
+      "random_unittest.cc",
+      "rsa_private_key_unittest.cc",
+      "rsa_private_key_nss_unittest.cc",
+      "secure_hash_unittest.cc",
+      "sha2_unittest.cc",
+      "signature_creator_unittest.cc",
+      "signature_verifier_unittest.cc",
+      "symmetric_key_unittest.cc",
+    ]
 
-  if (use_openssl || !is_linux) {
-    sources -= [
-      "rsa_private_key_nss_unittest.cc",
+    if (use_openssl || !is_linux) {
+      sources -= [
+        "rsa_private_key_nss_unittest.cc",
+      ]
+    }
+
+    if (use_openssl) {
+      sources -= [ "nss_util_unittest.cc" ]
+    } else {
+      sources -= [ "openssl_bio_string_unittest.cc" ]
+    }
+
+    deps = [
+      ":crypto",
+      ":platform",
+      ":test_support",
+      "//base",
+      "//base/test:run_all_unittests",
+      "//base/test:test_support",
+      "//testing/gmock",
+      "//testing/gtest",
     ]
   }
-
-  if (use_openssl) {
-    sources -= [ "nss_util_unittest.cc" ]
-  } else {
-    sources -= [ "openssl_bio_string_unittest.cc" ]
-  }
-
-  deps = [
-    ":crypto",
-    ":platform",
-    ":test_support",
-    "//base",
-    "//base/test:run_all_unittests",
-    "//base/test:test_support",
-    "//testing/gmock",
-    "//testing/gtest",
-  ]
 }
 
 source_set("test_support") {
   sources = [
     "scoped_test_nss_db.cc",
     "scoped_test_nss_db.h",
     "scoped_test_nss_chromeos_user.cc",
     "scoped_test_nss_chromeos_user.h",
     "scoped_test_system_nss_key_slot.cc",
     "scoped_test_system_nss_key_slot.h",
@@ skipping 45 matching lines @@
       ]
     } else {
       # Non-Linux platforms use the hermetic NSS from the tree.
       deps += [
         "//third_party/nss:nspr",
         "//third_party/nss:nss",
       ]
     }
   }
 }