Update webrtc&libjingle 6774:6825.

content/renderer/p2p/socket_client_impl.h

 // Copyright 2013 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.
 
 #ifndef CONTENT_RENDERER_P2P_SOCKET_CLIENT_IMPL_H_
 #define CONTENT_RENDERER_P2P_SOCKET_CLIENT_IMPL_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
@@ skipping 29 matching lines @@
                     P2PSocketClientDelegate* delegate);
 
   // Send the |data| to the |address|.
   virtual void Send(const net::IPEndPoint& address,
                     const std::vector<char>& data) OVERRIDE;
 
   // Send the |data| to the |address| using Differentiated Services Code Point
   // |dscp|.
   virtual void SendWithDscp(const net::IPEndPoint& address,
                             const std::vector<char>& data,
-                            const talk_base::PacketOptions& options) OVERRIDE;
+                            const rtc::PacketOptions& options) OVERRIDE;
 
   // Setting socket options.
   virtual void SetOption(P2PSocketOption option, int value) OVERRIDE;
 
   // Must be called before the socket is destroyed. The delegate may
   // not be called after |closed_task| is executed.
   virtual void Close() OVERRIDE;
 
   virtual int GetSocketID() const OVERRIDE;
 
@@ skipping 56 matching lines @@
   // These two fields are used to identify packets for tracing.
   uint32 random_socket_id_;
   uint32 next_packet_id_;
 
   DISALLOW_COPY_AND_ASSIGN(P2PSocketClientImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_P2P_SOCKET_CLIENT_IMPL_H_