Use ChannelMojo for remote security key channels.

remoting/host/security_key/security_key_ipc_client_unittest.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 <memory>
 #include <string>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "ipc/ipc_channel.h"
-#include "remoting/host/security_key/fake_ipc_security_key_auth_handler.h"
+#include "mojo/edk/test/scoped_ipc_support.h"
 #include "remoting/host/security_key/fake_security_key_ipc_server.h"
 #include "remoting/host/security_key/security_key_ipc_constants.h"

[joedow, 2016/11/03 22:25:18]

Remove this header since |fake_security_key_auth_handler_| was removed...also
delete the files since they aren't used.

[Sam McNally, 2016/11/04 02:51:09]

I'm not sure what you mean. The fake auth handler include is gone.

[joedow, 2016/11/04 15:19:04]

I noticed the files hadn't been deleted in that patch set and I must have
misread the header name, sorry about that :P

 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 const int kTestConnectionId = 1;
 const char kNonexistentIpcChannelName[] = "Nonexistent_IPC_Channel";
 const char kValidIpcChannelName[] = "SecurityKeyIpcClientTest";
 const int kLargeMessageSizeBytes = 256 * 1024;
 }  // namespace
 
 namespace remoting {
@@ skipping 31 matching lines @@
   // a response from |fake_ipc_server_| and verifies the payloads for both.
   void SendRequestAndResponse(const std::string& request_data,
                               const std::string& response_data);
 
   // Creates a unique IPC channel name to use for testing.
   std::string GenerateUniqueTestChannelName();
 
   // IPC tests require a valid MessageLoop to run.
   base::MessageLoopForIO message_loop_;
 
+  mojo::edk::test::ScopedIPCSupport ipc_support_;
+
   // Used to allow |message_loop_| to run during tests.  The instance is reset
   // after each stage of the tests has been completed.
   std::unique_ptr<base::RunLoop> run_loop_;
 
   // The object under test.
   SecurityKeyIpcClient security_key_ipc_client_;
 
-  // Provides a connection details message to |security_key_ipc_client_|
-  // for testing.
-  FakeIpcSecurityKeyAuthHandler fake_security_key_auth_handler_;
-
   // Used to send/receive security key IPC messages for testing.
   FakeSecurityKeyIpcServer fake_ipc_server_;
 
   // Stores the current session ID on supported platforms.
   uint32_t session_id_ = 0;
 
   // Tracks the success/failure of the last async operation.
   bool operation_failed_ = false;
 
   // Used to validate the object under test uses the correct ID when
   // communicating over the IPC channel.
   int last_connection_id_received_ = -1;
 
   // Stores the contents of the last IPC message received for validation.
   std::string last_message_received_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SecurityKeyIpcClientTest);
 };
 
 SecurityKeyIpcClientTest::SecurityKeyIpcClientTest()
-    : run_loop_(new base::RunLoop()),
+    : ipc_support_(message_loop_.task_runner()),
+      run_loop_(new base::RunLoop()),
       fake_ipc_server_(
           kTestConnectionId,
           /*client_session_details=*/nullptr,
           /*initial_connect_timeout=*/base::TimeDelta::FromMilliseconds(500),
           base::Bind(&SecurityKeyIpcClientTest::SendMessageToClient,
                      base::Unretained(this)),
+          base::Bind(&base::DoNothing),
           base::Bind(&SecurityKeyIpcClientTest::OperationComplete,
                      base::Unretained(this),
                      /*failed=*/false)) {}
 
 SecurityKeyIpcClientTest::~SecurityKeyIpcClientTest() {}
 
 void SecurityKeyIpcClientTest::SetUp() {
 #if defined(OS_WIN)
   DWORD session_id = 0;
   // If we are on Windows, then we need to set the correct session ID or the
@@ skipping 28 matching lines @@
 }
 
 std::string SecurityKeyIpcClientTest::GenerateUniqueTestChannelName() {
   return GetChannelNamePathPrefixForTest() + kValidIpcChannelName +
          IPC::Channel::GenerateUniqueRandomChannelID();
 }
 
 void SecurityKeyIpcClientTest::EstablishConnection(bool expect_success) {
   // Start up the security key forwarding session IPC channel first, that way
   // we can provide the channel using the fake SecurityKeyAuthHandler later on.
-  std::string ipc_session_channel_name = GenerateUniqueTestChannelName();
+  mojo::edk::NamedPlatformHandle channel_handle(
+      GenerateUniqueTestChannelName());
+  security_key_ipc_client_.SetIpcChannelHandleForTest(channel_handle);
   ASSERT_TRUE(fake_ipc_server_.CreateChannel(
-      ipc_session_channel_name,
+      channel_handle,
       /*request_timeout=*/base::TimeDelta::FromMilliseconds(500)));
-  ASSERT_TRUE(IPC::Channel::IsNamedServerInitialized(ipc_session_channel_name));
-  fake_security_key_auth_handler_.set_ipc_security_key_channel_name(
-      ipc_session_channel_name);
 
-  // Set up the channel name for the initial IPC channel.
-  std::string ipc_server_channel_name = GenerateUniqueTestChannelName();
-  fake_security_key_auth_handler_.set_ipc_server_channel_name(
-      ipc_server_channel_name);
-  security_key_ipc_client_.SetInitialIpcChannelNameForTest(
-      ipc_server_channel_name);
-
-  // Create the initial IPC channel and verify it was set up correctly.
-  ASSERT_FALSE(security_key_ipc_client_.WaitForSecurityKeyIpcServerChannel());
-  fake_security_key_auth_handler_.CreateSecurityKeyConnection();
-  ASSERT_TRUE(IPC::Channel::IsNamedServerInitialized(ipc_server_channel_name));
   ASSERT_TRUE(security_key_ipc_client_.WaitForSecurityKeyIpcServerChannel());
 
   // Establish the IPC channel so we can begin sending and receiving security
   // key messages.
   security_key_ipc_client_.EstablishIpcConnection(
       base::Bind(&SecurityKeyIpcClientTest::OperationComplete,
                  base::Unretained(this), /*failed=*/false),
       base::Bind(&SecurityKeyIpcClientTest::OperationComplete,
                  base::Unretained(this), /*failed=*/true));
   WaitForOperationComplete();
@@ skipping 94 matching lines @@
 
 TEST_F(SecurityKeyIpcClientTest, SendRequestBeforeEstablishingConnection) {
   // Sending a request will fail since the IPC connection has not been
   // established.
   ASSERT_FALSE(security_key_ipc_client_.SendSecurityKeyRequest(
       "Too soon!!", base::Bind(&SecurityKeyIpcClientTest::ClientMessageReceived,
                                base::Unretained(this))));
 }
 
 TEST_F(SecurityKeyIpcClientTest, NonExistentMainIpcServerChannel) {
-  std::string ipc_server_channel_name(kNonexistentIpcChannelName);
-  security_key_ipc_client_.SetInitialIpcChannelNameForTest(
-      ipc_server_channel_name);
+  security_key_ipc_client_.SetIpcChannelHandleForTest(
+      mojo::edk::NamedPlatformHandle(kNonexistentIpcChannelName));
 
   // Attempt to establish the conection (should fail since the IPC channel does
   // not exist).
-  security_key_ipc_client_.EstablishIpcConnection(
-      base::Bind(&SecurityKeyIpcClientTest::OperationComplete,
-                 base::Unretained(this), /*failed=*/false),
-      base::Bind(&SecurityKeyIpcClientTest::OperationComplete,
-                 base::Unretained(this), /*failed=*/true));
-  WaitForOperationComplete();
-  ASSERT_TRUE(operation_failed_);
-}
-
-TEST_F(SecurityKeyIpcClientTest, NonExistentIpcSessionChannel) {
-  fake_security_key_auth_handler_.set_ipc_security_key_channel_name(
-      kNonexistentIpcChannelName);
-
-  // Set up the channel name for the initial IPC channel.
-  std::string ipc_server_channel_name = GenerateUniqueTestChannelName();
-  fake_security_key_auth_handler_.set_ipc_server_channel_name(
-      ipc_server_channel_name);
-  security_key_ipc_client_.SetInitialIpcChannelNameForTest(
-      ipc_server_channel_name);
-
-  // Create the initial IPC channel and verify it was set up correctly.
-  ASSERT_FALSE(security_key_ipc_client_.WaitForSecurityKeyIpcServerChannel());
-  fake_security_key_auth_handler_.CreateSecurityKeyConnection();
-  ASSERT_TRUE(IPC::Channel::IsNamedServerInitialized(ipc_server_channel_name));
-  ASSERT_TRUE(security_key_ipc_client_.WaitForSecurityKeyIpcServerChannel());
-
-  // Attempt to establish the conection (should fail since the IPC channel does
-  // not exist).
   security_key_ipc_client_.EstablishIpcConnection(
       base::Bind(&SecurityKeyIpcClientTest::OperationComplete,
                  base::Unretained(this), /*failed=*/false),
       base::Bind(&SecurityKeyIpcClientTest::OperationComplete,
                  base::Unretained(this), /*failed=*/true));
   WaitForOperationComplete();
   ASSERT_TRUE(operation_failed_);
 }
 
 #if defined(OS_WIN)
 TEST_F(SecurityKeyIpcClientTest, SecurityKeyIpcServerRunningInWrongSession) {
   // Set the expected session Id to a different session than we are running in.
   security_key_ipc_client_.SetExpectedIpcServerSessionIdForTest(session_id_ +
                                                                 1);
 
   // Attempting to establish a connection should fail here since the IPC Server
   // is 'running' in a different session than expected.
   EstablishConnection(/*expect_success=*/false);
 }
 #endif  // defined(OS_WIN)
 
 }  // namespace remoting