summaryrefslogtreecommitdiffstats
path: root/net/cert/multi_threaded_cert_verifier_unittest.cc
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-04 09:10:30 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-04 09:10:30 +0000
commitb6213ab8053fa8feaccef5fbb5bc62279b4b865d (patch)
treea9655f4ab60711d5eb7a563c0661e1bbbdd1d3e3 /net/cert/multi_threaded_cert_verifier_unittest.cc
parenteb35952ae03feaf799ec5e6567990147e223cc3b (diff)
downloadchromium_src-b6213ab8053fa8feaccef5fbb5bc62279b4b865d.zip
chromium_src-b6213ab8053fa8feaccef5fbb5bc62279b4b865d.tar.gz
chromium_src-b6213ab8053fa8feaccef5fbb5bc62279b4b865d.tar.bz2
Revert 226920 "Roll Clang 188423:191856."
I suspect this caused a 25% sizes regression on Mac: http://build.chromium.org/f/chromium/perf/mac-release/sizes/report.html?history=150&rev=-1&graph=Chromium.app > Roll Clang 188423:191856. > > Remove libprofile_rt from package.sh, it doesn't exist after LLVM r191835 > > BUG=290204,303886 > R=thakis@chromium.org > TBR=net owner > NOTRY=true > > Review URL: https://codereview.chromium.org/25875004 TBR=thakis@chromium.org Review URL: https://codereview.chromium.org/25988002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226978 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/cert/multi_threaded_cert_verifier_unittest.cc')
-rw-r--r--net/cert/multi_threaded_cert_verifier_unittest.cc8
1 files changed, 1 insertions, 7 deletions
diff --git a/net/cert/multi_threaded_cert_verifier_unittest.cc b/net/cert/multi_threaded_cert_verifier_unittest.cc
index 3a0c765..17d23d3 100644
--- a/net/cert/multi_threaded_cert_verifier_unittest.cc
+++ b/net/cert/multi_threaded_cert_verifier_unittest.cc
@@ -279,13 +279,7 @@ TEST_F(MultiThreadedCertVerifierTest, CancelRequest) {
}
// Tests that a canceled request is not leaked.
-#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) {
+TEST_F(MultiThreadedCertVerifierTest, CancelRequestThenQuit) {
base::FilePath certs_dir = GetTestCertsDirectory();
scoped_refptr<X509Certificate> test_cert(
ImportCertFromFile(certs_dir, "ok_cert.pem"));