Webrtc deps roll.

content/browser/renderer_host/p2p/socket_host_unittest.cc

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/p2p/socket_host.h"
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/renderer_host/p2p/socket_host_test_utils.h"
@@ skipping 279 matching lines @@
 
   EXPECT_TRUE(packet_processing_helpers::UpdateRtpAbsSendTimeExtn(
       reinterpret_cast<char*>(kTurnSendIndicationMsgWithAbsSendTimeExtension),
       sizeof(kTurnSendIndicationMsgWithAbsSendTimeExtension), 3, 0));
 }
 
 // Test without any packet options variables set. This method should return
 // without HMAC value in the packet.
 TEST(P2PSocketHostTest, TestApplyPacketOptionsWithDefaultValues) {
   unsigned char fake_tag[4] = { 0xba, 0xdd, 0xba, 0xdd };
-  talk_base::PacketOptions options;
+  rtc::PacketOptions options;
   std::vector<char> rtp_packet;
   rtp_packet.resize(sizeof(kRtpMsgWithAbsSendTimeExtension) + 4);  // tag length
   memcpy(&rtp_packet[0], kRtpMsgWithAbsSendTimeExtension,
          sizeof(kRtpMsgWithAbsSendTimeExtension));
   memcpy(&rtp_packet[sizeof(kRtpMsgWithAbsSendTimeExtension)], fake_tag, 4);
   EXPECT_TRUE(
       packet_processing_helpers::ApplyPacketOptions(
       &rtp_packet[0], rtp_packet.size(), options, 0));
   // Making sure we have't updated the HMAC.
   EXPECT_EQ(0, memcmp(&rtp_packet[sizeof(kRtpMsgWithAbsSendTimeExtension)],
                       fake_tag, 4));
 
   // Verify AbsouluteSendTime extension field is not modified.
   EXPECT_EQ(0, memcmp(&rtp_packet[kAstIndexInRtpMsg],
                       kTestAstValue, sizeof(kTestAstValue)));
 }
 
 // Veirfy HMAC is updated when packet option parameters are set.
 TEST(P2PSocketHostTest, TestApplyPacketOptionsWithAuthParams) {
-  talk_base::PacketOptions options;
+  rtc::PacketOptions options;
   options.packet_time_params.srtp_auth_key.resize(20);
   options.packet_time_params.srtp_auth_key.assign(
       kTestKey, kTestKey + sizeof(kTestKey));
   options.packet_time_params.srtp_auth_tag_len = 4;
 
   std::vector<char> rtp_packet;
   rtp_packet.resize(sizeof(kRtpMsgWithAbsSendTimeExtension) + 4);  // tag length
   memcpy(&rtp_packet[0], kRtpMsgWithAbsSendTimeExtension,
          sizeof(kRtpMsgWithAbsSendTimeExtension));
   memcpy(&rtp_packet[sizeof(kRtpMsgWithAbsSendTimeExtension)], kFakeTag, 4);
@@ skipping 10 matching lines @@
 
 // Verify finding an extension ID in a raw rtp message.
 TEST(P2PSocketHostTest, TestUpdateAbsSendTimeExtensionInRtpPacket) {
   EXPECT_TRUE(packet_processing_helpers::UpdateRtpAbsSendTimeExtn(
       reinterpret_cast<char*>(kRtpMsgWithAbsSendTimeExtension),
       sizeof(kRtpMsgWithAbsSendTimeExtension), 3, 0));
 }
 
 // Verify we update both AbsSendTime extension header and HMAC.
 TEST(P2PSocketHostTest, TestApplyPacketOptionsWithAuthParamsAndAbsSendTime) {
-  talk_base::PacketOptions options;
+  rtc::PacketOptions options;
   options.packet_time_params.srtp_auth_key.resize(20);
   options.packet_time_params.srtp_auth_key.assign(
       kTestKey, kTestKey + sizeof(kTestKey));
   options.packet_time_params.srtp_auth_tag_len = 4;
   options.packet_time_params.rtp_sendtime_extension_id = 3;
   // 3 is also present in the test message.
 
   std::vector<char> rtp_packet;
   rtp_packet.resize(sizeof(kRtpMsgWithAbsSendTimeExtension) + 4);  // tag length
   memcpy(&rtp_packet[0], kRtpMsgWithAbsSendTimeExtension,
          sizeof(kRtpMsgWithAbsSendTimeExtension));
   memcpy(&rtp_packet[sizeof(kRtpMsgWithAbsSendTimeExtension)], kFakeTag, 4);
   EXPECT_TRUE(packet_processing_helpers::ApplyPacketOptions(
                   &rtp_packet[0], rtp_packet.size(), options, 0xccbbaa));
   // HMAC should be different from fake_tag.
   EXPECT_NE(0, memcmp(&rtp_packet[sizeof(kRtpMsgWithAbsSendTimeExtension)],
                       kFakeTag, sizeof(kFakeTag)));
 
   // ApplyPackets should have the new timestamp passed as input.
   unsigned char timestamp_array[3] = { 0xcc, 0xbb, 0xaa };
   EXPECT_EQ(0, memcmp(&rtp_packet[kAstIndexInRtpMsg],
                       timestamp_array, sizeof(timestamp_array)));
 }
 
 }  // namespace content