TransportController refactoring

webrtc/p2p/base/transportchannel.h

Index: webrtc/p2p/base/transportchannel.h
diff --git a/webrtc/p2p/base/transportchannel.h b/webrtc/p2p/base/transportchannel.h
index e0dcc3719f4641b5fdb563ca42371cee20107d4f..7bd646e8540cfe8a3121ad3475af75c3dc789ee8 100644
--- a/webrtc/p2p/base/transportchannel.h
+++ b/webrtc/p2p/base/transportchannel.h
@@ -37,16 +37,23 @@ enum PacketFlags {
 };
 
 // Used to indicate channel's connection state.
-enum TransportChannelState { STATE_CONNECTING, STATE_COMPLETED, STATE_FAILED };
+enum TransportChannelState {
+  STATE_INIT,
+  STATE_CONNECTING,  // Will enter this state once a connection is created
+  STATE_COMPLETED,
+  STATE_FAILED
+};
 
 // A TransportChannel represents one logical stream of packets that are sent
 // between the two sides of a session.
 class TransportChannel : public sigslot::has_slots<> {
  public:
-  explicit TransportChannel(const std::string& content_name, int component)
-      : content_name_(content_name),
+  explicit TransportChannel(const std::string& transport_name, int component)
+      : transport_name_(transport_name),
         component_(component),
-        readable_(false), writable_(false), receiving_(false) {}
+        readable_(false),
+        writable_(false),
+        receiving_(false) {}
   virtual ~TransportChannel() {}
 
   // TODO(guoweis) - Make this pure virtual once all subclasses of
@@ -59,7 +66,7 @@ class TransportChannel : public sigslot::has_slots<> {
   // Returns the session id of this channel.
   virtual const std::string SessionId() const { return std::string(); }
 
-  const std::string& content_name() const { return content_name_; }
+  const std::string& transport_name() const { return transport_name_; }
   int component() const { return component_; }
 
   // Returns the readable and states of this channel.  Each time one of these
@@ -148,10 +155,9 @@ class TransportChannel : public sigslot::has_slots<> {
   // Sets the receiving state, signaling if necessary.
   void set_receiving(bool receiving);
 
-
  private:
   // Used mostly for debugging.
-  std::string content_name_;
+  std::string transport_name_;
   int component_;
   bool readable_;
   bool writable_;