diff options
| author | sergeyu <sergeyu@chromium.org> | 2015-01-09 11:33:24 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-09 19:34:12 +0000 |
| commit | c5f104b31e1a640e4adaeaac7fca30c72eb04138 (patch) | |
| tree | f1de6d1828d8eaef25a9aa4e07a4a4d46764f045 /remoting/protocol/pairing_authenticator_base.cc | |
| parent | a261cb0d164c411e916fb62f4c560ce5acb260f3 (diff) | |
| download | chromium_src-c5f104b31e1a640e4adaeaac7fca30c72eb04138.zip chromium_src-c5f104b31e1a640e4adaeaac7fca30c72eb04138.tar.gz chromium_src-c5f104b31e1a640e4adaeaac7fca30c72eb04138.tar.bz2 | |
replace NULL->nullptr in src/remoting.
Review URL: https://codereview.chromium.org/810133003
Cr-Commit-Position: refs/heads/master@{#310816}
Diffstat (limited to 'remoting/protocol/pairing_authenticator_base.cc')
| -rw-r--r-- | remoting/protocol/pairing_authenticator_base.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/remoting/protocol/pairing_authenticator_base.cc b/remoting/protocol/pairing_authenticator_base.cc index 7435e55..54fde0c 100644 --- a/remoting/protocol/pairing_authenticator_base.cc +++ b/remoting/protocol/pairing_authenticator_base.cc @@ -117,7 +117,7 @@ bool PairingAuthenticatorBase::HasErrorMessage( std::string error = pairing_failed_tag->Attr(kPairingErrorAttribute); LOG(ERROR) << "Pairing failed: " << error; } - return pairing_failed_tag != NULL; + return pairing_failed_tag != nullptr; } void PairingAuthenticatorBase::CheckForFailedSpakeExchange( @@ -131,7 +131,7 @@ void PairingAuthenticatorBase::CheckForFailedSpakeExchange( using_paired_secret_ = false; error_message_ = "invalid-shared-secret"; v2_authenticator_.reset(); - buzz::XmlElement* no_message = NULL; + buzz::XmlElement* no_message = nullptr; SetAuthenticatorCallback set_authenticator = base::Bind( &PairingAuthenticatorBase::SetAuthenticatorAndProcessMessage, weak_factory_.GetWeakPtr(), no_message, resume_callback); |