Disable CertVerifyProcTest.PaypalNullCertParsing

net/cert/cert_verify_proc_unittest.cc

Index: net/cert/cert_verify_proc_unittest.cc
diff --git a/net/cert/cert_verify_proc_unittest.cc b/net/cert/cert_verify_proc_unittest.cc
index c7cf84d46d1b15ecd84bf062683dd3186a667c6c..aae81640922689f46dedd401c217c86818d53729 100644
--- a/net/cert/cert_verify_proc_unittest.cc
+++ b/net/cert/cert_verify_proc_unittest.cc
@@ -13,6 +13,7 @@
 #include "base/macros.h"
 #include "base/sha1.h"
 #include "base/strings/string_number_conversions.h"
+#include "build/build_config.h"
 #include "crypto/sha2.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_data_directory.h"
@@ -203,7 +204,15 @@ TEST_F(CertVerifyProcTest, MAYBE_EVVerification) {
   EXPECT_TRUE(verify_result.cert_status & CERT_STATUS_IS_EV);
 }
 
-TEST_F(CertVerifyProcTest, PaypalNullCertParsing) {
+// TODO(crbug.com/605457): this test is disabled on iOS as it should check
+// that the certificate has encoding issue but does not currently test it.
+#if !defined(OS_IOS)

[Ryan Sleevi, 2016/04/21 11:29:21]

As explained in the previous CL (but perhaps unclearly), this should be disabled
across all the platforms that aren't rejecting it as invalid

#if defined(USE_NSS_CERTS) || defined(OS_ANDROID) || (defined(OS_IOS) &&
TARGET_IPHONE_SIMULATOR && version < 9,3,0))
#define MAYBE_... PayPal
#else
#define MAYBE_... DISABLED_
#endif

Then remove line 242-246 (which is where the bug was introduced), remove the
#ifdefs around 250/253, and that should do the 'proper' test.

[sdefresne, 2016/04/21 13:04:20]

I've removed line 242-246 and changed the conditional to "defined(USE_NSS_CERTS)
|| !defined(OS_IOS)". This is because I cannot test the version of the OS that
the device is running, only the min deployement target, with macros. So I either
have to disable it completely on iOS or have to do runtime check.

+#define MAYBE_PaypalNullCertParsing PaypalNullCertParsing
+#else
+#define MAYBE_PaypalNullCertParsing DISABLED_PaypalNullCertParsing
+#endif
+
+TEST_F(CertVerifyProcTest, MAYBE_PaypalNullCertParsing) {
   scoped_refptr<X509Certificate> paypal_null_cert(
       X509Certificate::CreateFromBytes(
           reinterpret_cast<const char*>(paypal_null_der),