Remove use of RtpHeaderExtension and clean up

webrtc/media/engine/webrtcmediaengine.h

 /*
  *  Copyright (c) 2011 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 WebRtcMediaEngineFactory {
  public:
   static MediaEngineInterface* Create(
       webrtc::AudioDeviceModule* adm,
       WebRtcVideoEncoderFactory* encoder_factory,
       WebRtcVideoDecoderFactory* decoder_factory);
 };
 
 // Verify that extension IDs are within 1-byte extension range and are not
 // overlapping.
-bool ValidateRtpExtensions(const std::vector<RtpHeaderExtension>& extensions);
+bool ValidateRtpExtensions(const std::vector<webrtc::RtpExtension>& extensions);
 
-// Convert cricket::RtpHeaderExtension:s to webrtc::RtpExtension:s, discarding
-// any extensions not validated by the 'supported' predicate. Duplicate
+// Discard any extensions not validated by the 'supported' predicate. Duplicate
 // extensions are removed if 'filter_redundant_extensions' is set, and also any
-// mutually exclusive extensions (see implementation for details).
+// mutually exclusive extensions (see implementation for details) are removed.
 std::vector<webrtc::RtpExtension> FilterRtpExtensions(
-    const std::vector<RtpHeaderExtension>& extensions,
+    const std::vector<webrtc::RtpExtension>& extensions,
     bool (*supported)(const std::string&),
     bool filter_redundant_extensions);
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_ENGINE_WEBRTCMEDIAENGINE_H_