Remove use of RtpHeaderExtension and clean up

webrtc/config.h

Index: webrtc/config.h
diff --git a/webrtc/config.h b/webrtc/config.h
index 06460ae359641a533c7fdc4615e51637e72fb2ba..6350525841c19aa6d955e189c772f75b9d988556 100644
--- a/webrtc/config.h
+++ b/webrtc/config.h
@@ -52,20 +52,31 @@ struct FecConfig {
 
 // RTP header extension, see RFC 5285.
 struct RtpExtension {
-  RtpExtension(const std::string& name, int id) : name(name), id(id) {}
+  RtpExtension() : id(0) {}
+  RtpExtension(const std::string& uri, int id) : uri(uri), id(id) {}
   std::string ToString() const;
   bool operator==(const RtpExtension& rhs) const {
-    return name == rhs.name && id == rhs.id;
+    return uri == rhs.uri && id == rhs.id;
   }
-  static bool IsSupportedForAudio(const std::string& name);
-  static bool IsSupportedForVideo(const std::string& name);
-
-  static const char* kTOffset;
-  static const char* kAbsSendTime;
-  static const char* kVideoRotation;
-  static const char* kAudioLevel;
-  static const char* kTransportSequenceNumber;
-  std::string name;
+  static bool IsSupportedForAudio(const std::string& uri);
+  static bool IsSupportedForVideo(const std::string& uri);
+
+  static const char* kAudioLevelUri;
+  static const int kAudioLevelDefaultId;
+
+  static const char* kTimestampOffsetUri;
+  static const int kTimestampOffsetDefaultId;
+
+  static const char* kAbsSendTimeUri;
+  static const int kAbsSendTimeDefaultId;
+
+  static const char* kVideoRotationUri;
+  static const int kVideoRotationDefaultId;
+
+  static const char* kTransportSequenceNumberUri;
+  static const int kTransportSequenceNumberDefaultId;
+
+  std::string uri;
   int id;
 };