[Chromoting] Remove DataChannelManagerCallbacks constructor parameter of ClientSession

remoting/host/client_session.h

 // 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.
 
 #ifndef REMOTING_HOST_CLIENT_SESSION_H_
 #define REMOTING_HOST_CLIENT_SESSION_H_
 
 #include <cstdint>
 #include <memory>
 #include <string>
@@ skipping 79 matching lines @@
 
   // |event_handler| and |desktop_environment_factory| must outlive |this|.
   // All |HostExtension|s in |extensions| must outlive |this|.
   ClientSession(
       EventHandler* event_handler,
       std::unique_ptr<protocol::ConnectionToClient> connection,
       DesktopEnvironmentFactory* desktop_environment_factory,
       const DesktopEnvironmentOptions& desktop_environment_options,
       const base::TimeDelta& max_duration,
       scoped_refptr<protocol::PairingRegistry> pairing_registry,
-      const std::vector<HostExtension*>& extensions,
-      const std::vector<protocol::DataChannelManager::NameCallbackPair>&
-          data_channel_callbacks);
+      const std::vector<HostExtension*>& extensions);
   ~ClientSession() override;
 
   // Returns the set of capabilities negotiated between client and host.
   const std::string& capabilities() const { return capabilities_; }
 
   // protocol::HostStub interface.
   void NotifyClientResolution(
       const protocol::ClientResolution& resolution) override;
   void ControlVideo(const protocol::VideoControl& video_control) override;
   void ControlAudio(const protocol::AudioControl& audio_control) override;
@@ skipping 25 matching lines @@
   ClientSessionControl* session_control() override;
 
   protocol::ConnectionToClient* connection() const { return connection_.get(); }
 
   bool is_authenticated() { return is_authenticated_; }
 
   const std::string* client_capabilities() const {
     return client_capabilities_.get();
   }
 
+  // Registers a DataChannelManager callback for testing.
+  void RegisterDataChannelManagerCallbackForTesting(

[joedow, 2017/07/10 23:36:45]

nit: RegisterDataChannelManagerCallbackForTesting is a long name, shorten it to
something like RegisterCreateHandlerCallbackForTesting.

[Hzj_jie, 2017/07/11 01:11:15]

Done.

+      const std::string& prefix,
+      protocol::DataChannelManager::CreateHandlerCallback constructor);
+
   void SetEventTimestampsSourceForTests(
       scoped_refptr<protocol::InputEventTimestampsSource>
           event_timestamp_source);
 
  private:
   // Creates a proxy for sending clipboard events to the client.
   std::unique_ptr<protocol::ClipboardStub> CreateClipboardProxy();
 
   // protocol::VideoStream::Observer implementation.
   void OnVideoSizeChanged(protocol::VideoStream* stream,
@@ skipping 104 matching lines @@
   // Used to disable callbacks to |this| once DisconnectSession() has been
   // called.
   base::WeakPtrFactory<ClientSessionControl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ClientSession);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_HOST_CLIENT_SESSION_H_