Revert of Make P2PTransportChannel inherit from IceTransportInternal.

webrtc/p2p/base/transportcontroller.h

 /*
  *  Copyright 2015 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.
  */
 
@@ skipping 146 matching lines @@
       SignalCandidatesGathered;
 
   sigslot::signal1<const Candidates&> SignalCandidatesRemoved;
 
   sigslot::signal1<rtc::SSLHandshakeError> SignalDtlsHandshakeError;
 
  protected:
   // TODO(deadbeef): Get rid of these virtual methods. Used by
   // FakeTransportController currently, but FakeTransportController shouldn't
   // even be functioning by subclassing TransportController.
-  virtual IceTransportInternal* CreateIceTransportChannel_n(
+  virtual TransportChannelImpl* CreateIceTransportChannel_n(
       const std::string& transport_name,
       int component);
   virtual TransportChannelImpl* CreateDtlsTransportChannel_n(
       const std::string& transport_name,
       int component,
-      IceTransportInternal* ice);
+      TransportChannelImpl* ice);
 
  private:
   void OnMessage(rtc::Message* pmsg) override;
 
   class ChannelPair;
   typedef rtc::RefCountedObject<ChannelPair> RefCountedChannel;
 
   // Helper functions to get a channel or transport, or iterator to it (in case
   // it needs to be erased).
   std::vector<RefCountedChannel*>::iterator GetChannelIterator_n(
@@ skipping 81 matching lines @@
   bool quic_ = false;
 
   webrtc::MetricsObserverInterface* metrics_observer_ = nullptr;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(TransportController);
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_TRANSPORTCONTROLLER_H_