Revert of Remove webrtc/base/scoped_ptr.h

webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc

Index: webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc
diff --git a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc
index 932be1bb9e1c19490a397146ba96c941884ac0fd..1e7b355a879a203ac0d76b7c6c7bf578e1fdf30a 100644
--- a/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc
+++ b/webrtc/modules/rtp_rtcp/source/receive_statistics_impl.cc
@@ -11,8 +11,6 @@
 #include "webrtc/modules/rtp_rtcp/source/receive_statistics_impl.h"
 
 #include <math.h>
-
-#include <cstdlib>
 
 #include "webrtc/modules/rtp_rtcp/source/bitrate.h"
 #include "webrtc/modules/rtp_rtcp/source/time_util.h"
@@ -115,7 +113,7 @@
   int32_t time_diff_samples = (receive_time_rtp - last_receive_time_rtp) -
       (header.timestamp - last_received_timestamp_);
 
-  time_diff_samples = std::abs(time_diff_samples);
+  time_diff_samples = abs(time_diff_samples);
 
   // lib_jingle sometimes deliver crazy jumps in TS for the same stream.
   // If this happens, don't update jitter value. Use 5 secs video frequency
@@ -135,7 +133,7 @@
      (last_received_timestamp_ +
       last_received_transmission_time_offset_));
 
-  time_diff_samples_ext = std::abs(time_diff_samples_ext);
+  time_diff_samples_ext = abs(time_diff_samples_ext);
 
   if (time_diff_samples_ext < 450000) {
     int32_t jitter_diffQ4TransmissionTimeOffset =