Add DCHECK in SSL sockets to check that callbacks are not set to null.

The new DCHECKs would make it easier to debug the linked bug.

BUG=129658

Review URL: https://chromiumcodereview.appspot.com/10545074

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141135 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 0 deletions

diff --git a/net/socket/ssl_client_socket_nss.cc b/net/socket/ssl_client_socket_nss.cc
index b27ac44..a9c7bba 100644
--- a/net/socket/ssl_client_socket_nss.cc
+++ b/net/socket/ssl_client_socket_nss.cc
@@ -2893,6 +2893,7 @@ int SSLClientSocketNSS::Connect(const CompletionCallback& callback) {
   DCHECK(transport_.get());
   DCHECK_EQ(STATE_NONE, next_handshake_state_);
   DCHECK(user_connect_callback_.is_null());
+  DCHECK(!callback.is_null());
 
   EnsureThreadIdAssigned();
 
@@ -3045,6 +3046,7 @@ base::TimeDelta SSLClientSocketNSS::GetConnectTimeMicros() const {
 int SSLClientSocketNSS::Read(IOBuffer* buf, int buf_len,
                              const CompletionCallback& callback) {
   DCHECK(core_);
+  DCHECK(!callback.is_null());
 
   EnterFunction(buf_len);
   int rv = core_->Read(buf, buf_len, callback);
@@ -3056,6 +3058,7 @@ int SSLClientSocketNSS::Read(IOBuffer* buf, int buf_len,
 int SSLClientSocketNSS::Write(IOBuffer* buf, int buf_len,
                               const CompletionCallback& callback) {
   DCHECK(core_);
+  DCHECK(!callback.is_null());
 
   EnterFunction(buf_len);
   int rv = core_->Write(buf, buf_len, callback);
diff --git a/net/socket/ssl_server_socket_nss.cc b/net/socket/ssl_server_socket_nss.cc
index 2d7635d..60de5c6 100644
--- a/net/socket/ssl_server_socket_nss.cc
+++ b/net/socket/ssl_server_socket_nss.cc
@@ -148,6 +148,7 @@ int SSLServerSocketNSS::Read(IOBuffer* buf, int buf_len,
   DCHECK(user_handshake_callback_.is_null());
   DCHECK(!user_read_buf_);
   DCHECK(nss_bufs_);
+  DCHECK(!callback.is_null());
 
   user_read_buf_ = buf;
   user_read_buf_len_ = buf_len;
@@ -170,6 +171,7 @@ int SSLServerSocketNSS::Write(IOBuffer* buf, int buf_len,
   DCHECK(user_write_callback_.is_null());
   DCHECK(!user_write_buf_);
   DCHECK(nss_bufs_);
+  DCHECK(!callback.is_null());
 
   user_write_buf_ = buf;
   user_write_buf_len_ = buf_len;