TransportController refactoring

webrtc/p2p/base/p2ptransportchannel.h

Index: webrtc/p2p/base/p2ptransportchannel.h
diff --git a/webrtc/p2p/base/p2ptransportchannel.h b/webrtc/p2p/base/p2ptransportchannel.h
index 926de95a3bffed498bb8291ed4bd80a99cb048e3..f3d683ffbbfed5a1433531ea754cd15f95f2faf9 100644
--- a/webrtc/p2p/base/p2ptransportchannel.h
+++ b/webrtc/p2p/base/p2ptransportchannel.h
@@ -54,7 +54,7 @@ class P2PTransportChannel : public TransportChannelImpl,
   P2PTransportChannel(const std::string& content_name,
                       int component,
                       P2PTransport* transport,
-                      PortAllocator *allocator);
+                      PortAllocator* allocator);
   virtual ~P2PTransportChannel();
 
   // From TransportChannelImpl:
@@ -71,7 +71,7 @@ class P2PTransportChannel : public TransportChannelImpl,
                                        const std::string& ice_pwd);
   virtual void SetRemoteIceMode(IceMode mode);
   virtual void Connect();
-  virtual void OnSignalingReady();
+  virtual GatheringState gathering_state() const { return gathering_state_; }
   virtual void OnCandidate(const Candidate& candidate);
   // Sets the receiving timeout in milliseconds.
   // This also sets the check_receiving_delay proportionally.
@@ -168,7 +168,7 @@ class P2PTransportChannel : public TransportChannelImpl,
     return allocator_sessions_.back();
   }
 
-  void Allocate();
+  void StartGatheringCandidates();
   void UpdateConnectionStates();
   void RequestSort();
   void SortConnections();
@@ -222,10 +222,9 @@ class P2PTransportChannel : public TransportChannelImpl,
   void OnCheckReceiving();
 
   P2PTransport* transport_;
-  PortAllocator *allocator_;
-  rtc::Thread *worker_thread_;
+  PortAllocator* allocator_;
+  rtc::Thread* worker_thread_;
   bool incoming_only_;
-  bool waiting_for_signaling_;
   int error_;
   std::vector<PortAllocatorSession*> allocator_sessions_;
   std::vector<PortInterface *> ports_;
@@ -248,6 +247,7 @@ class P2PTransportChannel : public TransportChannelImpl,
   IceRole ice_role_;
   uint64 tiebreaker_;
   uint32 remote_candidate_generation_;
+  GatheringState gathering_state_;
 
   int check_receiving_delay_;
   int receiving_timeout_;