NSS Cros multiprofile: trust roots added by a profile shouldn't apply to other profiles.

net/cert/test_root_certs.h

Index: net/cert/test_root_certs.h
diff --git a/net/cert/test_root_certs.h b/net/cert/test_root_certs.h
index 03cedcc93385d280eca3971d83faad883e32fd94..c95c5d432b8ed6db51851adda849e0a40a59f430 100644
--- a/net/cert/test_root_certs.h
+++ b/net/cert/test_root_certs.h
@@ -9,6 +9,7 @@
 #include "base/memory/ref_counted.h"
 #include "build/build_config.h"
 #include "net/base/net_export.h"
+#include "net/cert/x509_certificate.h"
 
 #if defined(USE_NSS) || defined(OS_IOS)
 #include <list>
@@ -29,12 +30,10 @@ class FilePath;
 
 namespace net {
 
-class X509Certificate;
-
 // TestRootCerts is a helper class for unit tests that is used to
 // artificially mark a certificate as trusted, independent of the local
 // machine configuration.
-class NET_EXPORT_PRIVATE TestRootCerts {
+class NET_EXPORT TestRootCerts {
  public:
   // Obtains the Singleton instance to the trusted certificates.
   static TestRootCerts* GetInstance();
@@ -83,6 +82,11 @@ class NET_EXPORT_PRIVATE TestRootCerts {
   HCERTCHAINENGINE GetChainEngine() const;
 #endif
 
+#if defined(USE_NSS) || defined(OS_IOS) || \
+    (defined(USE_OPENSSL) && !defined(OS_ANDROID))
+  bool Contains(X509Certificate::OSCertHandle cert) const;

[Ryan Sleevi, 2014/01/30 05:27:40]

Not a terrible fan of passing the OSCertHandle, although I understand why.

I'd be OK with Contains(CERTCertificate*) and Contains(X509*) in the
platform-specific bits (much like 61, 66, and 76 all directly reference native
types)

[mattm, 2014/02/04 05:31:21]

Done.

+#endif
+
  private:
   friend struct base::DefaultLazyInstanceTraits<TestRootCerts>;