Move ConnectionToHost parameters out from Connect() call.

remoting/protocol/connection_to_host.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_PROTOCOL_CONNECTION_TO_HOST_H_
 #define REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_
 
 #include <set>
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/timer/timer.h"
 #include "remoting/jingle_glue/signal_strategy.h"
 #include "remoting/proto/internal.pb.h"
 #include "remoting/protocol/clipboard_filter.h"
 #include "remoting/protocol/errors.h"
 #include "remoting/protocol/input_filter.h"
 #include "remoting/protocol/message_reader.h"
 #include "remoting/protocol/monitored_video_stub.h"
 #include "remoting/protocol/session.h"
 #include "remoting/protocol/session_manager.h"
 
-namespace pp {
-class Instance;
-}  // namespace pp
-
 namespace remoting {
 
 class XmppProxy;
 class VideoPacket;
 
 namespace protocol {
 
 class AudioReader;
 class AudioStub;
 class Authenticator;
@@ skipping 40 matching lines @@
     virtual void OnConnectionReady(bool ready) = 0;
 
     // Called when the route type (direct vs. STUN vs. proxied) changes.
     virtual void OnRouteChanged(const std::string& channel_name,
                                 const protocol::TransportRoute& route) = 0;
   };
 
   ConnectionToHost(bool allow_nat_traversal);
   virtual ~ConnectionToHost();
 
-  // |signal_strategy| must outlive connection. |audio_stub| may be
-  // null, in which case audio will not be requested.
+  // Initiates a connection to the host specified by |host_jid|.
+  // |signal_strategy| is used to signal to the host, and must outlive the
+  // connection. Data channels will be negotiated over |transport_factory|.
+  // |authenticator| will be used to authenticate the session and data channels.
+  // |event_callback| will be notified of changes in the state of the connection
+  // and must outlive the ConnectionToHost.
+  // Caller must set stubs (see below) before calling Connect.
   virtual void Connect(SignalStrategy* signal_strategy,
+                       scoped_ptr<TransportFactory> transport_factory,
+                       scoped_ptr<Authenticator> authenticator,
                        const std::string& host_jid,
                        const std::string& host_public_key,
-                       scoped_ptr<TransportFactory> transport_factory,
-                       scoped_ptr<Authenticator> authenticator,
-                       HostEventCallback* event_callback,
-                       ClientStub* client_stub,
-                       ClipboardStub* clipboard_stub,
-                       VideoStub* video_stub,
-                       AudioStub* audio_stub);
+                       HostEventCallback* event_callback);
 
+  // Returns the session configuration that was negotiated with the host.
   virtual const SessionConfig& config();
 
   // Stubs for sending data to the host.
-  virtual ClipboardStub* clipboard_stub();
+  virtual ClipboardStub* clipboard_forwarder();
   virtual HostStub* host_stub();
   virtual InputStub* input_stub();
 
+  // Set the stubs which will handle messages from the host.

[Sergey Ulanov, 2014/05/21 03:42:33]

nit: put this above Connect(), because they are normally called before
Connect().

[Wez, 2014/05/21 05:14:21]

Done.

+  // The caller must ensure that stubs out-live the connection.
+  // Unless otherwise specified, all stubs must be set before Connect()
+  // is called.
+  virtual void set_client_stub(ClientStub* client_stub);

[Sergey Ulanov, 2014/05/21 03:42:33]

Do these need to be virtual? 
Can they be inlined?

[Wez, 2014/05/21 05:14:21]

Nope. Fixed.
set_video_stub() has a non-trivial impl, so I'd prefer to keep them all in the
cc.

+  virtual void set_clipboard_stub(ClipboardStub* clipboard_stub);
+  virtual void set_video_stub(VideoStub* video_stub);
+  // If no audio stub is specified then audio will not be requested.
+  virtual void set_audio_stub(AudioStub* audio_stub);
+
   // SignalStrategy::StatusObserver interface.
   virtual void OnSignalStrategyStateChange(
       SignalStrategy::State state) OVERRIDE;
   virtual bool OnSignalStrategyIncomingStanza(
       const buzz::XmlElement* stanza) OVERRIDE;
 
   // SessionManager::Listener interface.
   virtual void OnSessionManagerReady() OVERRIDE;
   virtual void OnIncomingSession(
       Session* session,
@@ skipping 53 matching lines @@
   ErrorCode error_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ConnectionToHost);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_