TransportController refactoring

webrtc/p2p/base/rawtransportchannel.h

Index: webrtc/p2p/base/rawtransportchannel.h
diff --git a/webrtc/p2p/base/rawtransportchannel.h b/webrtc/p2p/base/rawtransportchannel.h
index 75b494e65a0f1818753fdff657af09d1677e4403..ac8946fd5ea946560b33b071df567ec358a5cc24 100644
--- a/webrtc/p2p/base/rawtransportchannel.h
+++ b/webrtc/p2p/base/rawtransportchannel.h
@@ -20,10 +20,6 @@
 
 #if defined(FEATURE_ENABLE_PSTN)
 
-namespace rtc {
-class Thread;
-}
-
 namespace cricket {
 
 class Connection;
@@ -36,14 +32,12 @@ class StunPort;
 // Implements a channel that just sends bare packets once we have received the
 // address of the other side.  We pick a single address to send them based on
 // a simple investigation of NAT type.
-class RawTransportChannel : public TransportChannelImpl,
-    public rtc::MessageHandler {
+class RawTransportChannel : public TransportChannelImpl {
  public:
   RawTransportChannel(const std::string& content_name,
                       int component,
                       RawTransport* transport,
-                      rtc::Thread *worker_thread,
-                      PortAllocator *allocator);
+                      PortAllocator* allocator);
   virtual ~RawTransportChannel();
 
   // Implementation of normal channel packet sending.
@@ -68,12 +62,11 @@ class RawTransportChannel : public TransportChannelImpl,
   // SignalAvailableCandidate once we have decided.
   virtual void Connect();
 
+  virtual IceGatheringState gathering_state() const { return kIceGatheringNew; }
+
   // Resets state back to unconnected.
   virtual void Reset();
 
-  // We don't actually worry about signaling since we can't send new candidates.
-  virtual void OnSignalingReady() {}
-
   // Handles a message setting the remote address.  We are writable once we
   // have this since we now know where to send.
   virtual void OnCandidate(const Candidate& candidate);
@@ -160,7 +153,6 @@ class RawTransportChannel : public TransportChannelImpl,
 
  private:
   RawTransport* raw_transport_;
-  rtc::Thread *worker_thread_;
   PortAllocator* allocator_;
   PortAllocatorSession* allocator_session_;
   StunPort* stun_port_;
@@ -188,8 +180,7 @@ class RawTransportChannel : public TransportChannelImpl,
   void OnReadPacket(PortInterface* port, const char* data, size_t size,
                     const rtc::SocketAddress& addr);
 
-  // Handles a message to destroy unused ports.
-  virtual void OnMessage(rtc::Message *msg);
+  void DestroyUnusedPorts();
 
   DISALLOW_COPY_AND_ASSIGN(RawTransportChannel);
 };