1 files changed, 7 insertions, 10 deletions
diff --git a/webrtc/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc b/webrtc/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc
index 7a7645fd1b..87c0259b3e 100644
--- a/webrtc/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc
+++ b/webrtc/modules/rtp_rtcp/source/rtcp_format_remb_unittest.cc
@@ -21,16 +21,13 @@
 #include "webrtc/test/null_transport.h"
 #include "webrtc/typedefs.h"
 
+namespace webrtc {
 namespace {
 
-using namespace webrtc;
-
-
 class TestTransport : public Transport {
  public:
-  TestTransport(RTCPReceiver* rtcp_receiver) :
-    rtcp_receiver_(rtcp_receiver) {
-  }
+  explicit TestTransport(RTCPReceiver* rtcp_receiver)
+      : rtcp_receiver_(rtcp_receiver) {}
 
   bool SendRtp(const uint8_t* /*data*/,
                size_t /*len*/,
@@ -38,9 +35,8 @@ class TestTransport : public Transport {
     return false;
   }
   bool SendRtcp(const uint8_t* packet, size_t packetLength) override {
-    RTCPUtility::RTCPParserV2 rtcpParser((uint8_t*)packet,
-                                         packetLength,
-                                         true); // Allow non-compound RTCP
+    RTCPUtility::RTCPParserV2 rtcpParser(packet, packetLength,
+                                         true);  // Allow non-compound RTCP
 
     EXPECT_TRUE(rtcpParser.IsValid());
     RTCPHelp::RTCPPacketInformation rtcpPacketInformation;
@@ -53,11 +49,11 @@ class TestTransport : public Transport {
               rtcpPacketInformation.receiverEstimatedMaxBitrate);
     return true;
   }
+
  private:
   RTCPReceiver* rtcp_receiver_;
 };
 
-
 class RtcpFormatRembTest : public ::testing::Test {
  protected:
   RtcpFormatRembTest()
@@ -134,3 +130,4 @@ TEST_F(RtcpFormatRembTest, TestCompund) {
   EXPECT_EQ(0, rtcp_sender_->SendRTCP(feedback_state, kRtcpRemb));
 }
 }  // namespace
+}  // namespace webrtc