Cleanup ChannelFactory interface

remoting/protocol/jingle_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_PROTOCOL_JINGLE_SESSION_H_
 #define REMOTING_PROTOCOL_JINGLE_SESSION_H_
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 36 matching lines @@
   virtual ErrorCode error() OVERRIDE;
   virtual const std::string& jid() OVERRIDE;
   virtual const CandidateSessionConfig* candidate_config() OVERRIDE;
   virtual const SessionConfig& config() OVERRIDE;
   virtual void set_config(const SessionConfig& config) OVERRIDE;
   virtual ChannelFactory* GetTransportChannelFactory() OVERRIDE;
   virtual ChannelFactory* GetMultiplexedChannelFactory() OVERRIDE;
   virtual void Close() OVERRIDE;
 
   // ChannelFactory interface.
-  virtual void CreateStreamChannel(
-      const std::string& name,
-      const StreamChannelCallback& callback) OVERRIDE;
-  virtual void CreateDatagramChannel(
-      const std::string& name,
-      const DatagramChannelCallback& callback) OVERRIDE;
+  virtual void CreateChannel(const std::string& name,
+                             const ChannelCreatedCallback& callback) OVERRIDE;
   virtual void CancelChannelCreation(const std::string& name) OVERRIDE;
 
   // Transport::EventHandler interface.
   virtual void OnTransportCandidate(
       Transport* transport,
       const cricket::Candidate& candidate) OVERRIDE;
   virtual void OnTransportRouteChange(Transport* transport,
                                       const TransportRoute& route) OVERRIDE;
   virtual void OnTransportFailed(Transport* transport) OVERRIDE;
   virtual void OnTransportDeleted(Transport* transport) OVERRIDE;
@@ skipping 106 matching lines @@
 
   base::WeakPtrFactory<JingleSession> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(JingleSession);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_JINGLE_SESSION_H_