Roll base to 9e74307b276b2f9988005c0e97e85ee222586f79.

net/cert/x509_certificate_openssl.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 "net/cert/x509_certificate.h"
 
 #include <openssl/asn1.h>
 #include <openssl/bytestring.h>
 #include <openssl/crypto.h>
 #include <openssl/obj_mac.h>
@@ skipping 124 matching lines @@
     }
   }
 }
 
 class X509InitSingleton {
  public:
   static X509InitSingleton* GetInstance() {
     // We allow the X509 store to leak, because it is used from a non-joinable
     // worker that is not stopped on shutdown, hence may still be using
     // OpenSSL library after the AtExit runner has completed.
-    return Singleton<X509InitSingleton,
-                     LeakySingletonTraits<X509InitSingleton> >::get();
+    return base::Singleton<X509InitSingleton, base::LeakySingletonTraits<
+                                                  X509InitSingleton>>::get();
   }
   X509_STORE* store() const { return store_.get(); }
 
   void ResetCertStore() {
     store_.reset(X509_STORE_new());
     DCHECK(store_.get());
     X509_STORE_set_default_paths(store_.get());
     // TODO(joth): Enable CRL (see X509_STORE_set_flags(X509_V_FLAG_CRL_CHECK)).
   }
 
  private:
-  friend struct DefaultSingletonTraits<X509InitSingleton>;
+  friend struct base::DefaultSingletonTraits<X509InitSingleton>;
   X509InitSingleton() {
     crypto::EnsureOpenSSLInit();
     ResetCertStore();
   }
 
   crypto::ScopedOpenSSL<X509_STORE, X509_STORE_free> store_;
 
   DISALLOW_COPY_AND_ASSIGN(X509InitSingleton);
 };
 
@@ skipping 284 matching lines @@
 bool X509Certificate::IsSelfSigned(OSCertHandle cert_handle) {
   crypto::ScopedEVP_PKEY scoped_key(X509_get_pubkey(cert_handle));
   if (!scoped_key)
     return false;
 
   // NOTE: X509_verify() returns 1 in case of success, 0 or -1 on error.
   return X509_verify(cert_handle, scoped_key.get()) == 1;
 }
 
 }  // namespace net