Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / net / quic / crypto / proof_test.cc

diff --git a/src/net/quic/crypto/proof_test.cc b/src/net/quic/crypto/proof_test.cc
index b73471a..5336e72 100644 (file)
--- a/src/net/quic/crypto/proof_test.cc
+++ b/src/net/quic/crypto/proof_test.cc
@@ -38,9 +38,9 @@ class TestProofVerifierCallback : public ProofVerifierCallback {
         ok_(ok),
         error_details_(error_details) {}
 
-  virtual void Run(bool ok,
-                   const string& error_details,
-                   scoped_ptr<ProofVerifyDetails>* details) OVERRIDE {
+  void Run(bool ok,
+           const string& error_details,
+           scoped_ptr<ProofVerifyDetails>* details) override {
     *ok_ = ok;
     *error_details_ = error_details;
 
@@ -98,7 +98,7 @@ string LoadTestCert(const string& file_name) {
   base::FilePath certs_dir = GetTestCertsDirectory();
   scoped_refptr<X509Certificate> cert =
       ImportCertFromFile(certs_dir, "quic_" + file_name);
-  CHECK_NE(static_cast<X509Certificate*>(NULL), cert.get());
+  CHECK_NE(static_cast<X509Certificate*>(nullptr), cert.get());
 
   string der_bytes;
   CHECK(X509Certificate::GetDEREncoded(cert->os_cert_handle(), &der_bytes));