Update from https://crrev.com/304121

crypto/BUILD.gn

Index: crypto/BUILD.gn
diff --git a/crypto/BUILD.gn b/crypto/BUILD.gn
index 5991d024d01d221cd1e0ea6fcb55848400bd7c1a..f342af91a7f77d7f77a35b787e1d66f63a1b4840 100644
--- a/crypto/BUILD.gn
+++ b/crypto/BUILD.gn
@@ -124,11 +124,6 @@ component("crypto") {
     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 -= [
@@ -173,7 +168,9 @@ component("crypto") {
   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.
@@ -203,52 +200,55 @@ 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 -= [
+# 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) {
-    sources -= [ "nss_util_unittest.cc" ]
-  } else {
-    sources -= [ "openssl_bio_string_unittest.cc" ]
-  }
+    if (use_openssl || !is_linux) {
+      sources -= [
+        "rsa_private_key_nss_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") {