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

Side by Side Diff: remoting/protocol/ssl_hmac_channel_authenticator.cc

Issue 16964002: Rewrite scoped_ptr<T>(NULL) to use the default ctor in remoting/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/protocol/ssl_hmac_channel_authenticator.h" 5 #include "remoting/protocol/ssl_hmac_channel_authenticator.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "crypto/secure_util.h" 9 #include "crypto/secure_util.h"
10 #include "net/base/host_port_pair.h" 10 #include "net/base/host_port_pair.h"
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 if (auth_write_buf_.get() == NULL && auth_read_buf_.get() == NULL) { 259 if (auth_write_buf_.get() == NULL && auth_read_buf_.get() == NULL) {
260 DCHECK(socket_.get() != NULL); 260 DCHECK(socket_.get() != NULL);
261 if (callback_called) 261 if (callback_called)
262 *callback_called = true; 262 *callback_called = true;
263 done_callback_.Run(net::OK, socket_.PassAs<net::StreamSocket>()); 263 done_callback_.Run(net::OK, socket_.PassAs<net::StreamSocket>());
264 } 264 }
265 } 265 }
266 266
267 void SslHmacChannelAuthenticator::NotifyError(int error) { 267 void SslHmacChannelAuthenticator::NotifyError(int error) {
268 done_callback_.Run(static_cast<net::Error>(error), 268 done_callback_.Run(static_cast<net::Error>(error),
269 scoped_ptr<net::StreamSocket>(NULL)); 269 scoped_ptr<net::StreamSocket>());
270 } 270 }
271 271
272 } // namespace protocol 272 } // namespace protocol
273 } // namespace remoting 273 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698