Update IPC message handling for SecurityKeyIpcClient class

remoting/host/security_key/security_key_ipc_client.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/host/security_key/security_key_ipc_client.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 133 matching lines @@
   if (!response_data.empty()) {
     base::ResetAndReturn(&response_callback_).Run(response_data);
   } else {
     LOG(ERROR) << "Invalid response received";
     base::ResetAndReturn(&connection_error_callback_).Run();
   }
 }
 
 void SecurityKeyIpcClient::OnConnectionReady() {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(!connected_callback_.is_null());
 
-  base::ResetAndReturn(&connected_callback_).Run(/*connection_usable=*/true);
+  if (!connected_callback_.is_null()) {
+    base::ResetAndReturn(&connected_callback_).Run(/*connection_usable=*/true);
+  } else {

[Sergey Ulanov, 2016/12/22 23:01:36]

nit: It would be a bit more readable if you handle the error case and remove
else:
 if (!connected_callback_) {
   LOG(ERROR)...
   ...
   return;
 }

 base::ResetAndReturn(&connected_callback_).Run(/*connection_usable=*/true);

[joedow, 2016/12/22 23:39:00]

Done.

+    LOG(ERROR) << "Unexpected ConnectionReady message received.";
+    if (!connection_error_callback_.is_null()) {

[Sergey Ulanov, 2016/12/22 23:01:36]

if (connection_error_callback_)

[joedow, 2016/12/22 23:39:00]

I've updated this line and the rest of the file to use that style.

+      base::ResetAndReturn(&connection_error_callback_).Run();
+    }
+  }
 }
 
 void SecurityKeyIpcClient::OnInvalidSession() {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(!connected_callback_.is_null());
 
-  base::ResetAndReturn(&connected_callback_).Run(/*connection_usable=*/false);
+  if (!connected_callback_.is_null()) {
+    base::ResetAndReturn(&connected_callback_).Run(/*connection_usable=*/false);
+  } else {
+    LOG(ERROR) << "Unexpected InvalidSession message received.";
+    if (!connection_error_callback_.is_null()) {
+      base::ResetAndReturn(&connection_error_callback_).Run();
+    }
+  }
 }
 
 void SecurityKeyIpcClient::ConnectToIpcChannel() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Verify that any existing IPC connection has been closed.
   CloseIpcConnection();
 
   if (!channel_handle_.is_valid() && !CheckForSecurityKeyIpcServerChannel()) {
     if (!connection_error_callback_.is_null()) {
       base::ResetAndReturn(&connection_error_callback_).Run();
     }
     return;
   }
 
   ipc_channel_ = IPC::Channel::CreateClient(
       mojo::edk::ConnectToPeerProcess(std::move(channel_handle_)).release(),
       this);
   if (ipc_channel_->Connect()) {
     return;
   }
   ipc_channel_.reset();
 
   if (!connection_error_callback_.is_null()) {
     base::ResetAndReturn(&connection_error_callback_).Run();
   }
 }
 
 }  // namespace remoting