Revert of Make P2PTransportChannel inherit from IceTransportInternal.

webrtc/p2p/base/jseptransport.h

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_P2P_BASE_JSEPTRANSPORT_H_
 #define WEBRTC_P2P_BASE_JSEPTRANSPORT_H_
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "webrtc/base/constructormagic.h"
-#include "webrtc/base/messagequeue.h"
 #include "webrtc/base/optional.h"
-#include "webrtc/base/rtccertificate.h"
-#include "webrtc/base/sigslot.h"
-#include "webrtc/base/sslstreamadapter.h"
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/p2pconstants.h"
 #include "webrtc/p2p/base/sessiondescription.h"
 #include "webrtc/p2p/base/transportinfo.h"
+#include "webrtc/base/messagequeue.h"
+#include "webrtc/base/rtccertificate.h"
+#include "webrtc/base/sigslot.h"
+#include "webrtc/base/sslstreamadapter.h"
 
 namespace cricket {
 
 class TransportChannelImpl;
 class TransportChannelImpl;
 
 typedef std::vector<Candidate> Candidates;
 
 // TODO(deadbeef): Move all of these enums, POD types and utility methods to
 // another header file.
@@ skipping 289 matching lines @@
                                     std::string* error_desc) const;
 
   // Negotiates the SSL role based off the offer and answer as specified by
   // RFC 4145, section-4.1. Returns false if the SSL role cannot be determined
   // from the local description and remote description.
   bool NegotiateRole(ContentAction local_role,
                      rtc::SSLRole* ssl_role,
                      std::string* error_desc) const;
 
  private:
+  TransportChannelImpl* GetChannel(int component);
+
   // Negotiates the transport parameters based on the current local and remote
   // transport description, such as the ICE role to use, and whether DTLS
   // should be activated.
   //
   // Called when an answer TransportDescription is applied.
   bool NegotiateTransportDescription(ContentAction local_role,
                                      std::string* error_desc);
 
   // Pushes down the transport parameters from the local description, such
   // as the ICE ufrag and pwd.
@@ skipping 22 matching lines @@
 
   // Candidate component => DTLS channel
   std::map<int, TransportChannelImpl*> channels_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(JsepTransport);
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_JSEPTRANSPORT_H_