diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-06 02:38:04 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-06 02:38:04 +0000 |
| commit | d60566ad6aff5f064909f099447964ea7e3b2ffb (patch) | |
| tree | 5bef3d24b7e36dbaf2f2a18efb69706019b2bb9e /net/cert/multi_threaded_cert_verifier_unittest.cc | |
| parent | 60e96b39d7e1f00a0db8dcbc21647df8000e852e (diff) | |
| download | chromium_src-d60566ad6aff5f064909f099447964ea7e3b2ffb.zip chromium_src-d60566ad6aff5f064909f099447964ea7e3b2ffb.tar.gz chromium_src-d60566ad6aff5f064909f099447964ea7e3b2ffb.tar.bz2 | |
Revert 226920 "Roll Clang 188423:191856."
Possibly broke crash symbolication on mac.
> 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/26145004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227219 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.cc | 8 |
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")); |