Reland "Remove GICE (gone forever!) and PORTALLOCATOR_ENABLE_SHARED_UFRAG (enabled forever)." becau…

talk/session/media/mediasession.h

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 529 matching lines @@
 const ContentInfo* GetFirstAudioContent(const SessionDescription* sdesc);
 const ContentInfo* GetFirstVideoContent(const SessionDescription* sdesc);
 const ContentInfo* GetFirstDataContent(const SessionDescription* sdesc);
 const AudioContentDescription* GetFirstAudioContentDescription(
     const SessionDescription* sdesc);
 const VideoContentDescription* GetFirstVideoContentDescription(
     const SessionDescription* sdesc);
 const DataContentDescription* GetFirstDataContentDescription(
     const SessionDescription* sdesc);
 
-// Functions for translating media candidate names.
-
-// For converting between media ICE component and G-ICE channel
-// names.  For example:
-// "rtp" <=> 1
-// "rtcp" <=> 2
-// "video_rtp" <=> 1
-// "video_rtcp" <=> 2
-// Will not convert in the general case of arbitrary channel names,
-// but is useful for cases where we have candidates for media
-// channels.
-// returns false if there is no mapping.
-bool GetMediaChannelNameFromComponent(
-    int component, cricket::MediaType media_type, std::string* channel_name);
-bool GetMediaComponentFromChannelName(
-    const std::string& channel_name, int* component);
-bool GetMediaTypeFromChannelName(
-    const std::string& channel_name, cricket::MediaType* media_type);
-
 void GetSupportedAudioCryptoSuites(std::vector<std::string>* crypto_suites);
 void GetSupportedVideoCryptoSuites(std::vector<std::string>* crypto_suites);
 void GetSupportedDataCryptoSuites(std::vector<std::string>* crypto_suites);
 void GetSupportedDefaultCryptoSuites(std::vector<std::string>* crypto_suites);
 }  // namespace cricket
 
 #endif  // TALK_SESSION_MEDIA_MEDIASESSION_H_