Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2089)

Unified Diff: net/quic/crypto/proof_verifier_chromium.cc

Issue 1545233002: Convert Pass()→std::move() in //net (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/quic/crypto/channel_id_chromium.cc ('k') | net/quic/p2p/quic_p2p_session.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/crypto/proof_verifier_chromium.cc
diff --git a/net/quic/crypto/proof_verifier_chromium.cc b/net/quic/crypto/proof_verifier_chromium.cc
index fa8b8c5d9f02ed162dd616a3fb9922304733946d..d7ee393f762f98fcc6a1a0df7bef6341df1a0a1c 100644
--- a/net/quic/crypto/proof_verifier_chromium.cc
+++ b/net/quic/crypto/proof_verifier_chromium.cc
@@ -4,6 +4,8 @@
#include "net/quic/crypto/proof_verifier_chromium.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/callback_helpers.h"
@@ -176,7 +178,7 @@ QuicAsyncStatus ProofVerifierChromium::Job::VerifyProof(
*error_details = "Failed to create certificate chain. Certs are empty.";
DLOG(WARNING) << *error_details;
verify_details_->cert_verify_result.cert_status = CERT_STATUS_INVALID;
- *verify_details = verify_details_.Pass();
+ *verify_details = std::move(verify_details_);
return QUIC_FAILURE;
}
@@ -190,7 +192,7 @@ QuicAsyncStatus ProofVerifierChromium::Job::VerifyProof(
*error_details = "Failed to create certificate chain";
DLOG(WARNING) << *error_details;
verify_details_->cert_verify_result.cert_status = CERT_STATUS_INVALID;
- *verify_details = verify_details_.Pass();
+ *verify_details = std::move(verify_details_);
return QUIC_FAILURE;
}
@@ -209,7 +211,7 @@ QuicAsyncStatus ProofVerifierChromium::Job::VerifyProof(
*error_details = "Failed to verify signature of server config";
DLOG(WARNING) << *error_details;
verify_details_->cert_verify_result.cert_status = CERT_STATUS_INVALID;
- *verify_details = verify_details_.Pass();
+ *verify_details = std::move(verify_details_);
return QUIC_FAILURE;
}
@@ -218,14 +220,14 @@ QuicAsyncStatus ProofVerifierChromium::Job::VerifyProof(
next_state_ = STATE_VERIFY_CERT;
switch (DoLoop(OK)) {
case OK:
- *verify_details = verify_details_.Pass();
+ *verify_details = std::move(verify_details_);
return QUIC_SUCCESS;
case ERR_IO_PENDING:
callback_.reset(callback);
return QUIC_PENDING;
default:
*error_details = error_details_;
- *verify_details = verify_details_.Pass();
+ *verify_details = std::move(verify_details_);
return QUIC_FAILURE;
}
}
@@ -256,9 +258,9 @@ int ProofVerifierChromium::Job::DoLoop(int last_result) {
void ProofVerifierChromium::Job::OnIOComplete(int result) {
int rv = DoLoop(result);
if (rv != ERR_IO_PENDING) {
- scoped_ptr<ProofVerifierCallback> callback(callback_.Pass());
+ scoped_ptr<ProofVerifierCallback> callback(std::move(callback_));
// Callback expects ProofVerifyDetails not ProofVerifyDetailsChromium.
- scoped_ptr<ProofVerifyDetails> verify_details(verify_details_.Pass());
+ scoped_ptr<ProofVerifyDetails> verify_details(std::move(verify_details_));
callback->Run(rv == OK, error_details_, &verify_details);
// Will delete |this|.
proof_verifier_->OnJobComplete(this);
« no previous file with comments | « net/quic/crypto/channel_id_chromium.cc ('k') | net/quic/p2p/quic_p2p_session.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698