Use webrtc/base/logging.h for rtp_rtcp.

BUG=webrtc:5118
R=stefan@webrtc.org

Review URL: https://codereview.webrtc.org/1422023002 .

Cr-Commit-Position: refs/heads/master@{#10437}

webrtc/modules/rtp_rtcp/source/fec_receiver_impl.cc

@@ -12,11 +12,11 @@
 
 #include <assert.h>
 
+#include "webrtc/base/logging.h"
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_video.h"
 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
-#include "webrtc/system_wrappers/interface/logging.h"
 
 // RFC 5109
 namespace webrtc {

webrtc/modules/rtp_rtcp/source/forward_error_correction.cc

@@ -17,10 +17,10 @@
 #include <algorithm>
 #include <iterator>
 
+#include "webrtc/base/logging.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/modules/rtp_rtcp/source/forward_error_correction_internal.h"
-#include "webrtc/system_wrappers/interface/logging.h"
 
 namespace webrtc {
 

webrtc/modules/rtp_rtcp/source/h264_sps_parser.cc

@@ -10,9 +10,9 @@
 
 #include "webrtc/modules/rtp_rtcp/source/h264_sps_parser.h"
 
-#include "webrtc/base/bytebuffer.h"
 #include "webrtc/base/bitbuffer.h"
-#include "webrtc/system_wrappers/interface/logging.h"
+#include "webrtc/base/bytebuffer.h"
+#include "webrtc/base/logging.h"
 
 #define RETURN_FALSE_ON_FAIL(x) \
   if (!(x)) {                   \

webrtc/modules/rtp_rtcp/source/remote_ntp_time_estimator.cc

@@ -10,8 +10,8 @@
 
 #include "webrtc/modules/rtp_rtcp/interface/remote_ntp_time_estimator.h"
 
+#include "webrtc/base/logging.h"
 #include "webrtc/system_wrappers/interface/clock.h"
-#include "webrtc/system_wrappers/interface/logging.h"
 #include "webrtc/system_wrappers/interface/timestamp_extrapolator.h"
 
 namespace webrtc {

webrtc/modules/rtp_rtcp/source/rtcp_packet.cc

@@ -11,8 +11,8 @@
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet.h"
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
-#include "webrtc/system_wrappers/interface/logging.h"
 
 using webrtc::RTCPUtility::kBtDlrr;
 using webrtc::RTCPUtility::kBtReceiverReferenceTime;

webrtc/modules/rtp_rtcp/source/rtcp_receiver.cc

@@ -16,12 +16,12 @@
 #include <algorithm>
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
 #include "webrtc/base/trace_event.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_utility.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h"
 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
-#include "webrtc/system_wrappers/interface/logging.h"
 
 namespace webrtc {
 using namespace RTCPUtility;

webrtc/modules/rtp_rtcp/source/rtcp_sender.cc

@@ -18,13 +18,13 @@
 #include <limits>     // max
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
 #include "webrtc/base/trace_event.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.h"
 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
-#include "webrtc/system_wrappers/interface/logging.h"
 
 namespace webrtc {
 

webrtc/modules/rtp_rtcp/source/rtp_format_vp8.cc

@@ -15,8 +15,8 @@
 
 #include <vector>
 
+#include "webrtc/base/logging.h"
 #include "webrtc/modules/rtp_rtcp/source/vp8_partition_aggregator.h"
-#include "webrtc/system_wrappers/interface/logging.h"
 
 namespace webrtc {
 namespace {

webrtc/modules/rtp_rtcp/source/rtp_format_vp9.cc

@@ -17,7 +17,7 @@
 
 #include "webrtc/base/bitbuffer.h"
 #include "webrtc/base/checks.h"
-#include "webrtc/system_wrappers/interface/logging.h"
+#include "webrtc/base/logging.h"
 
 #define RETURN_FALSE_ON_ERROR(x) \
   if (!(x)) {                    \

webrtc/modules/rtp_rtcp/source/rtp_packet_history.cc

@@ -17,9 +17,9 @@
 #include <set>
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
-#include "webrtc/system_wrappers/interface/logging.h"
 
 namespace webrtc {
 

webrtc/modules/rtp_rtcp/source/rtp_payload_registry.cc

@@ -10,8 +10,8 @@
 
 #include "webrtc/modules/rtp_rtcp/interface/rtp_payload_registry.h"
 
+#include "webrtc/base/logging.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
-#include "webrtc/system_wrappers/interface/logging.h"
 
 namespace webrtc {
 

webrtc/modules/rtp_rtcp/source/rtp_receiver_audio.cc

@@ -14,9 +14,9 @@
 #include <math.h>   // pow()
 #include <string.h>  // memcpy()
 
+#include "webrtc/base/logging.h"
 #include "webrtc/base/trace_event.h"
 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
-#include "webrtc/system_wrappers/interface/logging.h"
 
 namespace webrtc {
 RTPReceiverStrategy* RTPReceiverStrategy::CreateAudioStrategy(

webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc

@@ -15,10 +15,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "webrtc/base/logging.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_payload_registry.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_receiver_strategy.h"
-#include "webrtc/system_wrappers/interface/logging.h"
 
 namespace webrtc {
 

webrtc/modules/rtp_rtcp/source/rtp_receiver_video.cc

@@ -14,6 +14,7 @@
 #include <string.h>
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
 #include "webrtc/base/trace_event.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_cvo.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_payload_registry.h"
@@ -21,7 +22,6 @@
 #include "webrtc/modules/rtp_rtcp/source/rtp_format_video_generic.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_utility.h"
 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
-#include "webrtc/system_wrappers/interface/logging.h"
 
 namespace webrtc {
 

webrtc/modules/rtp_rtcp/source/rtp_rtcp_impl.cc

@@ -15,8 +15,8 @@
 #include <set>
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
 #include "webrtc/common_types.h"
-#include "webrtc/system_wrappers/interface/logging.h"
 #include "webrtc/system_wrappers/interface/trace.h"
 
 #ifdef _WIN32

webrtc/modules/rtp_rtcp/source/rtp_sender.cc

@@ -14,13 +14,13 @@
 #include <utility>
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
 #include "webrtc/base/trace_event.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_cvo.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_sender_audio.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_sender_video.h"
 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
-#include "webrtc/system_wrappers/interface/logging.h"
 #include "webrtc/system_wrappers/interface/tick_util.h"
 
 namespace webrtc {

webrtc/modules/rtp_rtcp/source/rtp_sender_video.cc

@@ -16,6 +16,7 @@
 #include <vector>
 
 #include "webrtc/base/checks.h"
+#include "webrtc/base/logging.h"
 #include "webrtc/base/trace_event.h"
 #include "webrtc/modules/rtp_rtcp/interface/rtp_rtcp_defines.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
@@ -24,7 +25,6 @@
 #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp8.h"
 #include "webrtc/modules/rtp_rtcp/source/rtp_format_vp9.h"
 #include "webrtc/system_wrappers/interface/critical_section_wrapper.h"
-#include "webrtc/system_wrappers/interface/logging.h"
 
 namespace webrtc {
 enum { REDForFECHeaderLength = 1 };

webrtc/modules/rtp_rtcp/source/rtp_utility.cc

@@ -27,9 +27,9 @@
 #include <stdio.h>
 #endif
 
+#include "webrtc/base/logging.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 #include "webrtc/system_wrappers/interface/tick_util.h"
-#include "webrtc/system_wrappers/interface/logging.h"
 
 #if (defined(_DEBUG) && defined(_WIN32) && (_MSC_VER >= 1400))
 #define DEBUG_PRINT(...)           \