diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-20 15:06:40 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-11-22 11:48:58 +0000 |
commit | daa093eea7c773db06799a13bd7e4e2e2a9f8f14 (patch) | |
tree | 96cc5e7b9194c1b29eab927730bfa419e7111c25 /chromium/crypto/openssl_util.h | |
parent | be59a35641616a4cf23c4a13fa0632624b021c1b (diff) | |
download | qtwebengine-chromium-daa093eea7c773db06799a13bd7e4e2e2a9f8f14.tar.gz |
BASELINE: Update Chromium to 63.0.3239.58
Change-Id: Ia93b322a00ba4dd4004f3bcf1254063ba90e1605
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/crypto/openssl_util.h')
-rw-r--r-- | chromium/crypto/openssl_util.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/chromium/crypto/openssl_util.h b/chromium/crypto/openssl_util.h index 54f06d337f8..56ee54d2371 100644 --- a/chromium/crypto/openssl_util.h +++ b/chromium/crypto/openssl_util.h @@ -63,8 +63,7 @@ CRYPTO_EXPORT void EnsureOpenSSLInit(); // Drains the OpenSSL ERR_get_error stack. On a debug build the error codes // are send to VLOG(1), on a release build they are disregarded. In most // cases you should pass FROM_HERE as the |location|. -CRYPTO_EXPORT void ClearOpenSSLERRStack( - const tracked_objects::Location& location); +CRYPTO_EXPORT void ClearOpenSSLERRStack(const base::Location& location); // Place an instance of this class on the call stack to automatically clear // the OpenSSL error stack on function exit. @@ -73,7 +72,7 @@ class OpenSSLErrStackTracer { // Pass FROM_HERE as |location|, to help track the source of OpenSSL error // messages. Note any diagnostic emitted will be tagged with the location of // the constructor call as it's not possible to trace a destructor's callsite. - explicit OpenSSLErrStackTracer(const tracked_objects::Location& location) + explicit OpenSSLErrStackTracer(const base::Location& location) : location_(location) { EnsureOpenSSLInit(); } @@ -82,7 +81,7 @@ class OpenSSLErrStackTracer { } private: - const tracked_objects::Location location_; + const base::Location location_; DISALLOW_IMPLICIT_CONSTRUCTORS(OpenSSLErrStackTracer); }; |