From 990a00c30a2e87972506aac3a992a93ed3c8f79a Mon Sep 17 00:00:00 2001
From: "pthatcher@webrtc.org" <pthatcher@webrtc.org>
Date: Fri, 13 Mar 2015 18:20:33 +0000
Subject: [PATCH] Remove unused transport code.

This is a part of the big BUNDLE implementation at https://webrtc-codereview.appspot.com/45519004/

R=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/49389004

Cr-Commit-Position: refs/heads/master@{#8719}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8719 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 talk/session/media/channel.h | 13 +------------
 webrtc/p2p/base/session.cc   | 22 ----------------------
 webrtc/p2p/base/session.h    |  9 +--------
 3 files changed, 2 insertions(+), 42 deletions(-)

diff --git a/talk/session/media/channel.h b/talk/session/media/channel.h
index 1d0a887ff9..6256b35700 100644
--- a/talk/session/media/channel.h
+++ b/talk/session/media/channel.h
@@ -135,17 +135,6 @@ class BaseChannel
     srtp_filter_.set_signal_silent_time(silent_time);
   }
 
-  void set_content_name(const std::string& content_name) {
-    ASSERT(signaling_thread()->IsCurrent());
-    ASSERT(!writable_);
-    if (session_->state() != BaseSession::STATE_INIT) {
-      LOG(LS_ERROR) << "Content name for a channel can be changed only "
-                    << "when BaseSession is in STATE_INIT state.";
-      return;
-    }
-    content_name_ = content_name;
-  }
-
   template <class T>
   void RegisterSendSink(T* sink,
                         void (T::*OnPacket)(const void*, size_t, bool),
@@ -374,7 +363,7 @@ class BaseChannel
   std::vector<StreamParams> local_streams_;
   std::vector<StreamParams> remote_streams_;
 
-  std::string content_name_;
+  const std::string content_name_;
   bool rtcp_;
   TransportChannel* transport_channel_;
   TransportChannel* rtcp_transport_channel_;
diff --git a/webrtc/p2p/base/session.cc b/webrtc/p2p/base/session.cc
index 93a4a2b57d..1304b5e73d 100644
--- a/webrtc/p2p/base/session.cc
+++ b/webrtc/p2p/base/session.cc
@@ -137,28 +137,6 @@ void TransportProxy::AddUnsentCandidates(const Candidates& candidates) {
   }
 }
 
-bool TransportProxy::GetChannelNameFromComponent(
-    int component, std::string* channel_name) const {
-  const TransportChannelProxy* channel = GetChannelProxy(component);
-  if (channel == NULL) {
-    return false;
-  }
-
-  *channel_name = channel->name();
-  return true;
-}
-
-bool TransportProxy::GetComponentFromChannelName(
-    const std::string& channel_name, int* component) const {
-  const TransportChannelProxy* channel = GetChannelProxyByName(channel_name);
-  if (channel == NULL) {
-    return false;
-  }
-
-  *component = channel->component();
-  return true;
-}
-
 TransportChannelProxy* TransportProxy::GetChannelProxy(int component) const {
   ChannelMap::const_iterator iter = channels_.find(component);
   return (iter != channels_.end()) ? iter->second : NULL;
diff --git a/webrtc/p2p/base/session.h b/webrtc/p2p/base/session.h
index 7f2d8168c3..93c1e3cc5a 100644
--- a/webrtc/p2p/base/session.h
+++ b/webrtc/p2p/base/session.h
@@ -44,8 +44,7 @@ TransportWrapper;
 
 typedef std::map<int, TransportChannelProxy*> ChannelMap;
 
-class TransportProxy : public sigslot::has_slots<>,
-                       public CandidateTranslator {
+class TransportProxy : public sigslot::has_slots<> {
  public:
   TransportProxy(
       rtc::Thread* worker_thread,
@@ -112,12 +111,6 @@ class TransportProxy : public sigslot::has_slots<>,
   void OnSignalingReady();
   bool OnRemoteCandidates(const Candidates& candidates, std::string* error);
 
-  // CandidateTranslator methods.
-  virtual bool GetChannelNameFromComponent(
-      int component, std::string* channel_name) const;
-  virtual bool GetComponentFromChannelName(
-      const std::string& channel_name, int* component) const;
-
   // Called when a transport signals that it has new candidates.
   void OnTransportCandidatesReady(cricket::Transport* transport,
                                   const Candidates& candidates) {