diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
| commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
| tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/net/ssl/openssl_client_key_store.cc | |
| parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
| download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz | |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/net/ssl/openssl_client_key_store.cc')
| -rw-r--r-- | chromium/net/ssl/openssl_client_key_store.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chromium/net/ssl/openssl_client_key_store.cc b/chromium/net/ssl/openssl_client_key_store.cc index de1199f17ef..9b1b8767cf7 100644 --- a/chromium/net/ssl/openssl_client_key_store.cc +++ b/chromium/net/ssl/openssl_client_key_store.cc @@ -6,9 +6,10 @@ #include <openssl/evp.h> #include <openssl/x509.h> + #include <algorithm> +#include <memory> -#include "base/memory/scoped_ptr.h" #include "base/memory/singleton.h" #include "net/cert/x509_certificate.h" |