Revert 227219 "Revert 226920 "Roll Clang 188423:191856.""

trunk/src/net/cert/multi_threaded_cert_verifier_unittest.cc

Index: trunk/src/net/cert/multi_threaded_cert_verifier_unittest.cc
===================================================================
--- trunk/src/net/cert/multi_threaded_cert_verifier_unittest.cc	(revision 228317)
+++ trunk/src/net/cert/multi_threaded_cert_verifier_unittest.cc	(working copy)
@@ -279,7 +279,13 @@
 }
 
 // Tests that a canceled request is not leaked.
-TEST_F(MultiThreadedCertVerifierTest, CancelRequestThenQuit) {
+#if !defined(LEAK_SANITIZER)
+#define MAYBE_CancelRequestThenQuit CancelRequestThenQuit
+#else
+// See PR303886. LeakSanitizer flags a leak here.
+#define MAYBE_CancelRequestThenQuit DISABLED_CancelRequestThenQuit
+#endif
+TEST_F(MultiThreadedCertVerifierTest, MAYBE_CancelRequestThenQuit) {
   base::FilePath certs_dir = GetTestCertsDirectory();
   scoped_refptr<X509Certificate> test_cert(
       ImportCertFromFile(certs_dir, "ok_cert.pem"));