Revert 202305 "Destroy all Singletons and LazyInstances between ..."

trunk/src/chromeos/network/onc/onc_certificate_importer_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 "chromeos/network/onc/onc_certificate_importer.h"
 
 #include <cert.h>
 #include <certdb.h>
 #include <keyhi.h>
 #include <pk11pub.h>
 #include <string>
 
 #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"
 #include "crypto/nss_util.h"
 #include "net/base/crypto_module.h"
 #include "net/cert/cert_type.h"
 #include "net/cert/nss_cert_database.h"
 #include "net/cert/x509_certificate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 48 matching lines @@
     EXPECT_TRUE(CleanupSlotContents());
     EXPECT_EQ(0ul, ListCertsInSlot().size());
   }
 
   virtual ~ONCCertificateImporterTest() {}
 
  protected:
   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;
     base::ListValue* certificates = NULL;
     onc->RemoveWithoutPathExpansion(toplevel_config::kCertificates,
                                     &certificates_value);
     certificates_value->GetAsList(&certificates);
     onc_certificates_.reset(certificates);
 
     web_trust_certificates_.clear();
@@ skipping 213 matching lines @@
                   "certificate-client-update.onc"),
         CertParam(net::SERVER_CERT,
                   "certificate-server.onc",
                   "certificate-server-update.onc"),
         CertParam(net::CA_CERT,
                   "certificate-web-authority.onc",
                   "certificate-web-authority-update.onc")));
 
 }  // namespace onc
 }  // namespace chromeos