Update webrtc&libjingle 6774:6825.

content/renderer/p2p/port_allocator.h

 // Copyright (c) 2012 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_PORT_ALLOCATOR_H_
 #define CONTENT_RENDERER_P2P_PORT_ALLOCATOR_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/base/net_util.h"
@@ skipping 38 matching lines @@
 
     std::vector<RelayServerConfig> relays;
 
     bool legacy_relay;
     // Disable TCP-based transport when set to true.
     bool disable_tcp_transport;
   };
 
   P2PPortAllocator(blink::WebFrame* web_frame,
                    P2PSocketDispatcher* socket_dispatcher,
-                   talk_base::NetworkManager* network_manager,
-                   talk_base::PacketSocketFactory* socket_factory,
+                   rtc::NetworkManager* network_manager,
+                   rtc::PacketSocketFactory* socket_factory,
                    const Config& config);
   virtual ~P2PPortAllocator();
 
   virtual cricket::PortAllocatorSession* CreateSessionInternal(
       const std::string& content_name,
       int component,
       const std::string& ice_username_fragment,
       const std::string& ice_password) OVERRIDE;
 
  private:
@@ skipping 37 matching lines @@
   void AllocateLegacyRelaySession();
   void ParseRelayResponse();
 
   void AddConfig();
 
   P2PPortAllocator* allocator_;
 
   scoped_ptr<blink::WebURLLoader> relay_session_request_;
   int relay_session_attempts_;
   std::string relay_session_response_;
-  talk_base::SocketAddress relay_ip_;
+  rtc::SocketAddress relay_ip_;
   int relay_udp_port_;
   int relay_tcp_port_;
   int relay_ssltcp_port_;
   int pending_relay_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(P2PPortAllocatorSession);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_P2P_PORT_ALLOCATOR_H_