[Chromoting] Remove DataChannelManagerCallbacks constructor parameter of ClientSession

remoting/host/client_session_unittest.cc

 // Copyright (c) 2012 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/client_session.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 117 matching lines @@
   scoped_refptr<AutoThreadTaskRunner> task_runner_;
 
   // Used to run |message_loop_| after each test, until no objects remain that
   // require it.
   base::RunLoop run_loop_;
 
   // HostExtensions to pass when creating the ClientSession. Caller retains
   // ownership of the HostExtensions themselves.
   std::vector<HostExtension*> extensions_;
 
-  std::vector<protocol::DataChannelManager::NameCallbackPair>
-      data_channel_callbacks_;
-
   // ClientSession instance under test.
   std::unique_ptr<ClientSession> client_session_;
 
   // ClientSession::EventHandler mock for use in tests.
   MockClientSessionEventHandler session_event_handler_;
 
   // Stubs returned to |client_session_| components by |connection_|.
   MockClientStub client_stub_;
 
   // ClientSession owns |connection_| but tests need it to inject fake events.
@@ skipping 32 matching lines @@
   // HostStub is not touched by ClientSession, so we can safely pass nullptr.
   std::unique_ptr<protocol::FakeConnectionToClient> connection(
       new protocol::FakeConnectionToClient(std::move(session)));
   connection->set_client_stub(&client_stub_);
   connection_ = connection.get();
 
   client_session_.reset(new ClientSession(
       &session_event_handler_, std::move(connection),
       desktop_environment_factory_.get(),
       DesktopEnvironmentOptions::CreateDefault(), base::TimeDelta(), nullptr,
-      extensions_, data_channel_callbacks_));
+      extensions_));
 }
 
 void ClientSessionTest::CreateClientSession() {
   CreateClientSession(base::MakeUnique<protocol::FakeSession>());
 }
 
 void ClientSessionTest::ConnectClientSession() {
   EXPECT_CALL(session_event_handler_, OnSessionAuthenticated(_));
   EXPECT_CALL(session_event_handler_, OnSessionChannelsConnected(_));
 
@@ skipping 227 matching lines @@
   EXPECT_TRUE(extension2.was_instantiated());
   EXPECT_FALSE(extension2.has_handled_message());
 
   // ext3 was sent a message but not instantiated.
   EXPECT_FALSE(extension3.was_instantiated());
 }
 
 TEST_F(ClientSessionTest, DataChannelCallbackIsCalled) {
   bool callback_called = false;
 
-  data_channel_callbacks_.push_back(
-      protocol::DataChannelManager::NameCallbackPair(
-          kTestDataChannelCallbackName,
-          base::Bind([](bool* callback_was_called, const std::string& name,
-                        std::unique_ptr<protocol::MessagePipe> pipe)
-                         -> void { *callback_was_called = true; },
-                     &callback_called)));
-
   CreateClientSession();
+  client_session_->RegisterCreateHandlerCallbackForTesting(
+      kTestDataChannelCallbackName,
+      base::Bind([](bool* callback_was_called, const std::string& name,
+                    std::unique_ptr<protocol::MessagePipe> pipe)
+                     -> void { *callback_was_called = true; },
+                 &callback_called));
   ConnectClientSession();
 
   std::unique_ptr<protocol::MessagePipe> pipe =
       base::WrapUnique(new protocol::FakeMessagePipe(false));
 
   client_session_->OnIncomingDataChannel(kTestDataChannelCallbackName,
                                          std::move(pipe));
 
   ASSERT_TRUE(callback_called);
 }
@@ skipping 50 matching lines @@
   CreateClientSession(std::move(session));
   ConnectClientSession();
   ASSERT_FALSE(desktop_environment_factory_->last_desktop_environment()
                    ->options()
                    .desktop_capture_options()
                    ->allow_directx_capturer());
 }
 #endif
 
 }  // namespace remoting