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

trunk/src/net/cert/multi_threaded_cert_verifier_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "net/cert/multi_threaded_cert_verifier.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
@@ skipping 261 matching lines @@
                              &request_handle,
                              BoundNetLog());
     ASSERT_EQ(ERR_IO_PENDING, error);
     EXPECT_TRUE(request_handle);
     error = callback.WaitForResult();
     verifier_.ClearCache();
   }
 }
 
 // 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"));
   ASSERT_NE(static_cast<X509Certificate*>(NULL), test_cert);
 
   int error;
   CertVerifyResult verify_result;
   TestCompletionCallback callback;
   CertVerifier::RequestHandle request_handle;
 
@@ skipping 177 matching lines @@
   Mock::VerifyAndClearExpectations(&trust_provider);
   ASSERT_EQ(ERR_IO_PENDING, error);
   EXPECT_TRUE(request_handle);
   error = callback.WaitForResult();
   EXPECT_EQ(ERR_CERT_COMMON_NAME_INVALID, error);
   ASSERT_EQ(3u, verifier_.requests());
   ASSERT_EQ(1u, verifier_.cache_hits());
 }
 
 }  // namespace net