Roll base to 9e74307b276b2f9988005c0e97e85ee222586f79.

crypto/openssl_util.cc

 // Copyright (c) 2011 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 "crypto/openssl_util.h"
 
 #include <openssl/err.h>
 #include <openssl/ssl.h>
 #include <openssl/cpu.h>
 
@@ skipping 24 matching lines @@
   static OpenSSLInitSingleton* GetInstance() {
     // We allow the SSL environment to leak for multiple reasons:
     //   -  it is used from a non-joinable worker thread that is not stopped on
     //      shutdown, hence may still be using OpenSSL library after the AtExit
     //      runner has completed.
     //   -  There are other OpenSSL related singletons (e.g. the client socket
     //      context) who's cleanup depends on the global environment here, but
     //      we can't control the order the AtExit handlers will run in so
     //      allowing the global environment to leak at least ensures it is
     //      available for those other singletons to reliably cleanup.
-    return Singleton<OpenSSLInitSingleton,
-               LeakySingletonTraits<OpenSSLInitSingleton> >::get();
+    return base::Singleton<
+        OpenSSLInitSingleton,
+        base::LeakySingletonTraits<OpenSSLInitSingleton>>::get();
   }
  private:
-  friend struct DefaultSingletonTraits<OpenSSLInitSingleton>;
+  friend struct base::DefaultSingletonTraits<OpenSSLInitSingleton>;
   OpenSSLInitSingleton() {
 #if defined(OS_ANDROID) && defined(ARCH_CPU_ARMEL)
     const bool has_neon =
         (android_getCpuFeatures() & ANDROID_CPU_ARM_FEATURE_NEON) != 0;
     // CRYPTO_set_NEON_capable is called before |SSL_library_init| because this
     // stops BoringSSL from probing for NEON support via SIGILL in the case
     // that getauxval isn't present.
     CRYPTO_set_NEON_capable(has_neon);
     // See https://code.google.com/p/chromium/issues/detail?id=341598
     base::CPU cpu;
@@ skipping 63 matching lines @@
     std::string message;
     location.Write(true, true, &message);
     DVLOG(1) << "OpenSSL ERR_get_error stack from " << message;
     ERR_print_errors_cb(&OpenSSLErrorCallback, NULL);
   } else {
     ERR_clear_error();
   }
 }
 
 }  // namespace crypto