Fixing Intermittent SecurityKey Unittest Failures

remoting/host/security_key/fake_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/fake_security_key_ipc_client.h"
 
 #include <memory>
 
 #include "base/callback.h"
 #include "base/macros.h"
@@ skipping 91 matching lines @@
   channel_event_callback_.Run();
 }
 
 void FakeSecurityKeyIpcClient::OnInvalidSession() {
   invalid_session_error_ = true;
   channel_event_callback_.Run();
 }
 
 void FakeSecurityKeyIpcClient::OnChannelConnected(int32_t peer_pid) {
   ipc_channel_connected_ = true;
-  channel_event_callback_.Run();
+
+  // We don't always want to fire this event as only a subset of tests care
+  // about the channel being connected.  Tests that do care can register for it.
+  if (on_channel_connected_callback_) {
+    on_channel_connected_callback_.Run();
+  }
 }
 
 void FakeSecurityKeyIpcClient::OnChannelError() {
   ipc_channel_connected_ = false;
   channel_event_callback_.Run();
 }
 
 void FakeSecurityKeyIpcClient::OnSecurityKeyResponse(
     const std::string& request_data) {
   last_message_received_ = request_data;
   channel_event_callback_.Run();
 }
 
 }  // namespace remoting