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

net/cert/test_root_certs.h

 // 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.
 
 #ifndef NET_CERT_TEST_ROOT_CERTS_H_
 #define NET_CERT_TEST_ROOT_CERTS_H_
 
 #include "base/lazy_instance.h"
 #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>
 #elif defined(USE_OPENSSL) && !defined(OS_ANDROID)
 #include <vector>
 #elif defined(OS_WIN)
 #include <windows.h>
 #include <wincrypt.h>
 #elif defined(OS_MACOSX)
 #include <CoreFoundation/CFArray.h>
 #include <Security/SecTrust.h>
 #include "base/mac/scoped_cftyperef.h"
 #endif
 
 namespace base {
 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();
 
   // Returns true if an instance exists, without forcing an initialization.
   static bool HasInstance();
 
   // Marks |certificate| as trusted for X509Certificate::Verify(). Returns
   // false if the certificate could not be marked trusted.
   bool Add(X509Certificate* certificate);
@@ skipping 28 matching lines @@
 #elif defined(OS_WIN)
   HCERTSTORE temporary_roots() const { return temporary_roots_; }
 
   // Returns an HCERTCHAINENGINE suitable to be used for certificate
   // validation routines, or NULL to indicate that the default system chain
   // engine is appropriate. The caller is responsible for freeing the
   // returned HCERTCHAINENGINE.
   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>;
 
   TestRootCerts();
   ~TestRootCerts();
 
   // Performs platform-dependent initialization.
   void Init();
 
 #if defined(USE_NSS) || defined(OS_IOS)
@@ skipping 35 matching lines @@
 
  private:
   scoped_refptr<X509Certificate> cert_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedTestRoot);
 };
 
 }  // namespace net
 
 #endif  // NET_CERT_TEST_ROOT_CERTS_H_