diff options
| author | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-25 19:04:49 +0000 |
|---|---|---|
| committer | rsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-25 19:04:49 +0000 |
| commit | d70d82db35eecb586629a05bffc580282c0c30b4 (patch) | |
| tree | 05a9b5c78c89d4c32e67c9d873dbdb12369545b1 /chromeos | |
| parent | 88bfc75e6658b3820babff8b4983a93e5f67d5e1 (diff) | |
| download | chromium_src-d70d82db35eecb586629a05bffc580282c0c30b4.zip chromium_src-d70d82db35eecb586629a05bffc580282c0c30b4.tar.gz chromium_src-d70d82db35eecb586629a05bffc580282c0c30b4.tar.bz2 | |
Revert 202305 "Destroy all Singletons and LazyInstances between ..."
> Destroy all Singletons and LazyInstances between each test.
>
> This modifies base::TestSuite to add a test listener that runs the AtExitManager
> between each test.
>
> BUG=110594, 156433, 238654
> TEST=*unit*tests
> R=apatrick@chromium.org, gspencer@chromium.org, phajdan.jr@chromium.org, pneubeck@chromium.org, rsleevi@chromium.org
>
> Review URL: https://codereview.chromium.org/8947021
TBR=rsesek@chromium.org
Review URL: https://codereview.chromium.org/16063002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202312 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromeos')
| -rw-r--r-- | chromeos/network/onc/onc_certificate_importer_unittest.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chromeos/network/onc/onc_certificate_importer_unittest.cc b/chromeos/network/onc/onc_certificate_importer_unittest.cc index fba0871f..1fbb633 100644 --- a/chromeos/network/onc/onc_certificate_importer_unittest.cc +++ b/chromeos/network/onc/onc_certificate_importer_unittest.cc @@ -12,7 +12,6 @@ #include "base/logging.h" #include "base/string_number_conversions.h" -#include "base/threading/platform_thread.h" #include "base/values.h" #include "chromeos/network/onc/onc_constants.h" #include "chromeos/network/onc/onc_test_utils.h" @@ -81,10 +80,6 @@ class ONCCertificateImporterTest : public testing::Test { void AddCertificatesFromFile( std::string filename, CertificateImporter::ParseResult expected_parse_result) { - // This 1 second sleep is necessary because NSS has a caching bug. This - // can be removed once http://crbug.com/238654 is fixed. - base::PlatformThread::Sleep(base::TimeDelta::FromSeconds(1)); - scoped_ptr<base::DictionaryValue> onc = test_utils::ReadTestDictionary(filename); base::Value* certificates_value = NULL; |