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

trunk/src/chromeos/network/onc/onc_certificate_importer_unittest.cc

Index: trunk/src/chromeos/network/onc/onc_certificate_importer_unittest.cc
===================================================================
--- trunk/src/chromeos/network/onc/onc_certificate_importer_unittest.cc	(revision 202308)
+++ trunk/src/chromeos/network/onc/onc_certificate_importer_unittest.cc	(working copy)
@@ -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 @@
   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;