Revert of TransportController refactoring.

webrtc/p2p/base/transportchannel.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.
  */
 
@@ skipping 19 matching lines @@
 class Candidate;
 
 // Flags for SendPacket/SignalReadPacket.
 enum PacketFlags {
   PF_NORMAL       = 0x00,  // A normal packet.
   PF_SRTP_BYPASS  = 0x01,  // An encrypted SRTP packet; bypass any additional
                            // crypto provided by the transport (e.g. DTLS)
 };
 
 // Used to indicate channel's connection state.
-enum TransportChannelState {
-  STATE_INIT,
-  STATE_CONNECTING,  // Will enter this state once a connection is created
-  STATE_COMPLETED,
-  STATE_FAILED
-};
+enum TransportChannelState { STATE_CONNECTING, 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& transport_name, int component)
-      : transport_name_(transport_name),
+  explicit TransportChannel(const std::string& content_name, int component)
+      : content_name_(content_name),
         component_(component),
         writable_(false),
         receiving_(false) {}
   virtual ~TransportChannel() {}
 
   // TODO(guoweis) - Make this pure virtual once all subclasses of
   // TransportChannel have this defined.
   virtual TransportChannelState GetState() const {
     return TransportChannelState::STATE_CONNECTING;
   }
 
   // TODO(mallinath) - Remove this API, as it's no longer useful.
   // Returns the session id of this channel.
   virtual const std::string SessionId() const { return std::string(); }
 
-  const std::string& transport_name() const { return transport_name_; }
+  const std::string& content_name() const { return content_name_; }
   int component() const { return component_; }
 
   // Returns the states of this channel.  Each time one of these states changes,
   // a signal is raised.  These states are aggregated by the TransportManager.
   bool writable() const { return writable_; }
   bool receiving() const { return receiving_; }
   sigslot::signal1<TransportChannel*> SignalWritableState;
   // Emitted when the TransportChannel's ability to send has changed.
   sigslot::signal1<TransportChannel*> SignalReadyToSend;
   sigslot::signal1<TransportChannel*> SignalReceivingState;
@@ skipping 65 matching lines @@
  protected:
   // TODO(honghaiz): Remove this once chromium's unit tests no longer call it.
   void set_readable(bool readable) { set_receiving(readable); }
 
   // Sets the writable state, signaling if necessary.
   void set_writable(bool writable);
 
   // Sets the receiving state, signaling if necessary.
   void set_receiving(bool receiving);
 
+
  private:
   // Used mostly for debugging.
-  std::string transport_name_;
+  std::string content_name_;
   int component_;
   bool writable_;
   bool receiving_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(TransportChannel);
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_TRANSPORTCHANNEL_H_