Revert of Remove webrtc/base/scoped_ptr.h

webrtc/modules/rtp_rtcp/include/rtp_payload_registry.h

 /*
  *  Copyright (c) 2013 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.
  */
 
 #ifndef WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_
 #define WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_
 
 #include <map>
 #include <memory>
 
 #include "webrtc/base/criticalsection.h"
+#include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
 
 namespace webrtc {
 
 // This strategy deals with the audio/video-specific aspects
 // of payload handling.
 class RTPPayloadStrategy {
  public:
   virtual ~RTPPayloadStrategy() {}
@@ skipping 149 matching lines @@
   std::map<int, int> rtx_payload_type_map_;
   // When true, use rtx_payload_type_map_ when restoring RTX packets to get the
   // correct payload type.
   bool use_rtx_payload_mapping_on_restore_;
   uint32_t ssrc_rtx_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_RTP_RTCP_INCLUDE_RTP_PAYLOAD_REGISTRY_H_