Destroy all Singletons and LazyInstances between each test.

chromeos/network/onc/onc_certificate_importer_unittest.cc

Index: chromeos/network/onc/onc_certificate_importer_unittest.cc
diff --git a/chromeos/network/onc/onc_certificate_importer_unittest.cc b/chromeos/network/onc/onc_certificate_importer_unittest.cc
index 1fbb633a9056f7532cbb7daf95b55f55ba0cdfec..3db4eea418a599c9c8ee62affb0577a76a5a6096 100644
--- a/chromeos/network/onc/onc_certificate_importer_unittest.cc
+++ b/chromeos/network/onc/onc_certificate_importer_unittest.cc
@@ -155,14 +155,16 @@ TEST_F(ONCCertificateImporterTest, MultipleCertificates) {
   EXPECT_EQ(onc_certificates_->GetSize(), result_list_.size());
 }
 
-TEST_F(ONCCertificateImporterTest, MultipleCertificatesWithFailures) {
+// Doesn't work with singleton isolation <http://crbug.com/238654>.

[Paweł Hajdan Jr., 2013/05/08 16:32:25]

Please find a good owner for this bug, and let the owner sign off on this patch
*before* it is checked in.

I think you're hitting the same problems I hit before - and maybe that's indeed
the way to handle it for now (it's a huge improvement for stability of the
tests), but hey, we're really decreasing our test coverage in a pretty important
area.

[Robert Sesek, 2013/05/08 16:42:11]

Done. I think the net win outweighs the importance of any one test, though.

+TEST_F(ONCCertificateImporterTest, DISABLED_MultipleCertificatesWithFailures) {
   AddCertificatesFromFile("toplevel_partially_invalid.onc",
                           CertificateImporter::IMPORT_INCOMPLETE);
   EXPECT_EQ(2ul, onc_certificates_->GetSize());
   EXPECT_EQ(1ul, result_list_.size());
 }
 
-TEST_F(ONCCertificateImporterTest, AddClientCertificate) {
+// Doesn't work with singleton isolation <http://crbug.com/238654>.
+TEST_F(ONCCertificateImporterTest, DISABLED_AddClientCertificate) {
   std::string guid;
   AddCertificateFromFile("certificate-client.onc", net::USER_CERT, &guid);
   EXPECT_TRUE(web_trust_certificates_.empty());
@@ -199,7 +201,8 @@ TEST_F(ONCCertificateImporterTest, AddClientCertificate) {
   }
 }
 
-TEST_F(ONCCertificateImporterTest, AddServerCertificate) {
+// Doesn't work with singleton isolation <http://crbug.com/238654>.
+TEST_F(ONCCertificateImporterTest, DISABLED_AddServerCertificate) {
   std::string guid;
   AddCertificateFromFile("certificate-server.onc", net::SERVER_CERT, &guid);
 
@@ -217,7 +220,8 @@ TEST_F(ONCCertificateImporterTest, AddServerCertificate) {
                                 web_trust_certificates_[0]->os_cert_handle()));
 }
 
-TEST_F(ONCCertificateImporterTest, AddWebAuthorityCertificate) {
+// Doesn't work with singleton isolation <http://crbug.com/238654>.
+TEST_F(ONCCertificateImporterTest, DISABLED_AddWebAuthorityCertificate) {
   std::string guid;
   AddCertificateFromFile("certificate-web-authority.onc", net::CA_CERT, &guid);
 
@@ -235,7 +239,9 @@ TEST_F(ONCCertificateImporterTest, AddWebAuthorityCertificate) {
                                 web_trust_certificates_[0]->os_cert_handle()));
 }
 
-TEST_F(ONCCertificateImporterTest, AddAuthorityCertificateWithoutWebTrust) {
+// Doesn't work with singleton isolation <http://crbug.com/238654>.
+TEST_F(ONCCertificateImporterTest,
+       DISABLED_AddAuthorityCertificateWithoutWebTrust) {
   std::string guid;
   AddCertificateFromFile("certificate-authority.onc", net::CA_CERT, &guid);
   EXPECT_TRUE(web_trust_certificates_.empty());
@@ -267,7 +273,8 @@ class ONCCertificateImporterTestWithParam :
       public testing::WithParamInterface<CertParam> {
 };
 
-TEST_P(ONCCertificateImporterTestWithParam, UpdateCertificate) {
+// Doesn't work with singleton isolation <http://crbug.com/238654>.
+TEST_P(ONCCertificateImporterTestWithParam, DISABLED_UpdateCertificate) {
   // First we import a certificate.
   {
     SCOPED_TRACE("Import original certificate");
@@ -286,7 +293,8 @@ TEST_P(ONCCertificateImporterTestWithParam, UpdateCertificate) {
   }
 }
 
-TEST_P(ONCCertificateImporterTestWithParam, ReimportCertificate) {
+// Doesn't work with singleton isolation <http://crbug.com/238654>.
+TEST_P(ONCCertificateImporterTestWithParam, DISABLED_ReimportCertificate) {
   // Verify that reimporting a client certificate works.
   for (int i = 0; i < 2; ++i) {
     SCOPED_TRACE("Import certificate, iteration " + base::IntToString(i));