Cleanup ConnectionToHost of non-P2P-API code.

remoting/protocol/connection_to_host.h

 // Copyright (c) 2011 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 <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/task.h"
 #include "remoting/jingle_glue/signal_strategy.h"
 #include "remoting/proto/internal.pb.h"
 #include "remoting/protocol/connection_to_host.h"
 #include "remoting/protocol/message_reader.h"
 #include "remoting/protocol/session.h"
 #include "remoting/protocol/session_manager.h"
 
 namespace base {
 class MessageLoopProxy;
 }  // namespace base
 
 namespace pp {
 class Instance;
 }  // namespace pp
 
-namespace talk_base {
-class NetworkManager;
-class PacketSocketFactory;
-}  // namespace talk_base
-
 namespace remoting {
 
 class JingleThread;
-class HostResolverFactory;
-class PortAllocatorSessionFactory;
 class XmppProxy;
 class VideoPacket;
 
 namespace protocol {
 
 class ClientMessageDispatcher;
 class ClientControlSender;
 class ClientStub;
 class HostControlSender;
 class HostStub;
@@ skipping 22 matching lines @@
     virtual void OnConnectionOpened(ConnectionToHost* conn) = 0;
 
     // Called when the network connection is closed.
     virtual void OnConnectionClosed(ConnectionToHost* conn) = 0;
 
     // Called when the network connection has failed.
     virtual void OnConnectionFailed(ConnectionToHost* conn) = 0;
   };
 
   // Takes ownership of |network_manager| and |socket_factory|. Both
   // |network_manager| and |socket_factory| may be set to NULL.

[Wez, 2011/09/22 13:49:45]

Remove this comment.

[Sergey Ulanov, 2011/09/22 18:12:00]

Done.

   //
   // TODO(sergeyu): Constructor shouldn't need thread here.

[Wez, 2011/09/22 13:49:45]

nit: This comment is out-of-date.

[Sergey Ulanov, 2011/09/22 18:12:00]

Done.

   ConnectionToHost(base::MessageLoopProxy* network_message_loop,
                    pp::Instance* pp_instance,
-                   talk_base::NetworkManager* network_manager,
-                   talk_base::PacketSocketFactory* socket_factory,
-                   HostResolverFactory* host_resolver_factory,
-                   PortAllocatorSessionFactory* session_factory,
                    bool allow_nat_traversal);
   virtual ~ConnectionToHost();
 
   virtual void Connect(scoped_refptr<XmppProxy> xmpp_proxy,
                        const std::string& your_jid,
                        const std::string& host_jid,
                        const std::string& host_public_key,
                        const std::string& access_code,
                        HostEventCallback* event_callback,
                        ClientStub* client_stub,
@@ skipping 40 matching lines @@
   // Callback for |video_reader_|.
   void OnVideoPacket(VideoPacket* packet);
 
   void CloseOnError();
 
   // Stops writing in the channels.
   void CloseChannels();
 
   scoped_refptr<base::MessageLoopProxy> message_loop_;
   pp::Instance* pp_instance_;
-  scoped_ptr<talk_base::NetworkManager> network_manager_;
-  scoped_ptr<talk_base::PacketSocketFactory> socket_factory_;
-  scoped_ptr<HostResolverFactory> host_resolver_factory_;
-  scoped_ptr<PortAllocatorSessionFactory> port_allocator_session_factory_;
   bool allow_nat_traversal_;
 
   std::string host_jid_;
   std::string host_public_key_;
   std::string access_code_;
 
   HostEventCallback* event_callback_;
 
   // Stub for incoming messages.
   ClientStub* client_stub_;
@@ skipping 23 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(ConnectionToHost);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(remoting::protocol::ConnectionToHost);
 
 #endif  // REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_