Revert "Update webrtc&libjingle 6774:6799."

remoting/protocol/chromium_socket_factory.cc

 // Copyright 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 "remoting/protocol/chromium_socket_factory.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "jingle/glue/utils.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/udp/udp_server_socket.h"
 #include "remoting/protocol/socket_util.h"
-#include "third_party/webrtc/base/asyncpacketsocket.h"
-#include "third_party/webrtc/base/nethelpers.h"
+#include "third_party/libjingle/source/talk/base/asyncpacketsocket.h"
+#include "third_party/libjingle/source/talk/base/nethelpers.h"
 
 namespace remoting {
 namespace protocol {
 
 namespace {
 
 // Size of the buffer to allocate for RecvFrom().
 const int kReceiveBufferSize = 65536;
 
 // Maximum amount of data in the send buffers. This is necessary to
 // prevent out-of-memory crashes if the caller sends data faster than
 // Pepper's UDP API can handle it. This maximum should never be
 // reached under normal conditions.
 const int kMaxSendBufferSize = 256 * 1024;
 
-class UdpPacketSocket : public rtc::AsyncPacketSocket {
+class UdpPacketSocket : public talk_base::AsyncPacketSocket {
  public:
   UdpPacketSocket();
   virtual ~UdpPacketSocket();
 
-  bool Init(const rtc::SocketAddress& local_address,
+  bool Init(const talk_base::SocketAddress& local_address,
             int min_port, int max_port);
 
-  // rtc::AsyncPacketSocket interface.
-  virtual rtc::SocketAddress GetLocalAddress() const OVERRIDE;
-  virtual rtc::SocketAddress GetRemoteAddress() const OVERRIDE;
+  // talk_base::AsyncPacketSocket interface.
+  virtual talk_base::SocketAddress GetLocalAddress() const OVERRIDE;
+  virtual talk_base::SocketAddress GetRemoteAddress() const OVERRIDE;
   virtual int Send(const void* data, size_t data_size,
-                   const rtc::PacketOptions& options) OVERRIDE;
+                   const talk_base::PacketOptions& options) OVERRIDE;
   virtual int SendTo(const void* data, size_t data_size,
-                     const rtc::SocketAddress& address,
-                     const rtc::PacketOptions& options) OVERRIDE;
+                     const talk_base::SocketAddress& address,
+                     const talk_base::PacketOptions& options) OVERRIDE;
   virtual int Close() OVERRIDE;
   virtual State GetState() const OVERRIDE;
-  virtual int GetOption(rtc::Socket::Option option, int* value) OVERRIDE;
-  virtual int SetOption(rtc::Socket::Option option, int value) OVERRIDE;
+  virtual int GetOption(talk_base::Socket::Option option, int* value) OVERRIDE;
+  virtual int SetOption(talk_base::Socket::Option option, int value) OVERRIDE;
   virtual int GetError() const OVERRIDE;
   virtual void SetError(int error) OVERRIDE;
 
  private:
   struct PendingPacket {
     PendingPacket(const void* buffer,
                   int buffer_size,
                   const net::IPEndPoint& address);
 
     scoped_refptr<net::IOBufferWithSize> data;
     net::IPEndPoint address;
     bool retried;
   };
 
   void OnBindCompleted(int error);
 
   void DoSend();
   void OnSendCompleted(int result);
 
   void DoRead();
   void OnReadCompleted(int result);
   void HandleReadResult(int result);
 
   scoped_ptr<net::UDPServerSocket> socket_;
 
   State state_;
   int error_;
 
-  rtc::SocketAddress local_address_;
+  talk_base::SocketAddress local_address_;
 
   // Receive buffer and address are populated by asynchronous reads.
   scoped_refptr<net::IOBuffer> receive_buffer_;
   net::IPEndPoint receive_address_;
 
   bool send_pending_;
   std::list<PendingPacket> send_queue_;
   int send_queue_size_;
 
   DISALLOW_COPY_AND_ASSIGN(UdpPacketSocket);
@@ skipping 13 matching lines @@
     : state_(STATE_CLOSED),
       error_(0),
       send_pending_(false),
       send_queue_size_(0) {
 }
 
 UdpPacketSocket::~UdpPacketSocket() {
   Close();
 }
 
-bool UdpPacketSocket::Init(const rtc::SocketAddress& local_address,
+bool UdpPacketSocket::Init(const talk_base::SocketAddress& local_address,
                            int min_port, int max_port) {
   net::IPEndPoint local_endpoint;
   if (!jingle_glue::SocketAddressToIPEndPoint(
           local_address, &local_endpoint)) {
     return false;
   }
 
   for (int port = min_port; port <= max_port; ++port) {
     socket_.reset(new net::UDPServerSocket(NULL, net::NetLog::Source()));
     int result = socket_->Listen(
@@ skipping 15 matching lines @@
                                               &local_address_)) {
     return false;
   }
 
   state_ = STATE_BOUND;
   DoRead();
 
   return true;
 }
 
-rtc::SocketAddress UdpPacketSocket::GetLocalAddress() const {
+talk_base::SocketAddress UdpPacketSocket::GetLocalAddress() const {
   DCHECK_EQ(state_, STATE_BOUND);
   return local_address_;
 }
 
-rtc::SocketAddress UdpPacketSocket::GetRemoteAddress() const {
+talk_base::SocketAddress UdpPacketSocket::GetRemoteAddress() const {
   // UDP sockets are not connected - this method should never be called.
   NOTREACHED();
-  return rtc::SocketAddress();
+  return talk_base::SocketAddress();
 }
 
 int UdpPacketSocket::Send(const void* data, size_t data_size,
-                          const rtc::PacketOptions& options) {
+                          const talk_base::PacketOptions& options) {
   // UDP sockets are not connected - this method should never be called.
   NOTREACHED();
   return EWOULDBLOCK;
 }
 
 int UdpPacketSocket::SendTo(const void* data, size_t data_size,
-                            const rtc::SocketAddress& address,
-                            const rtc::PacketOptions& options) {
+                            const talk_base::SocketAddress& address,
+                            const talk_base::PacketOptions& options) {
   if (state_ != STATE_BOUND) {
     NOTREACHED();
     return EINVAL;
   }
 
   if (error_ != 0) {
     return error_;
   }
 
   net::IPEndPoint endpoint;
@@ skipping 11 matching lines @@
   DoSend();
   return data_size;
 }
 
 int UdpPacketSocket::Close() {
   state_ = STATE_CLOSED;
   socket_.reset();
   return 0;
 }
 
-rtc::AsyncPacketSocket::State UdpPacketSocket::GetState() const {
+talk_base::AsyncPacketSocket::State UdpPacketSocket::GetState() const {
   return state_;
 }
 
-int UdpPacketSocket::GetOption(rtc::Socket::Option option, int* value) {
+int UdpPacketSocket::GetOption(talk_base::Socket::Option option, int* value) {
   // This method is never called by libjingle.
   NOTIMPLEMENTED();
   return -1;
 }
 
-int UdpPacketSocket::SetOption(rtc::Socket::Option option, int value) {
+int UdpPacketSocket::SetOption(talk_base::Socket::Option option, int value) {
   if (state_ != STATE_BOUND) {
     NOTREACHED();
     return EINVAL;
   }
 
   switch (option) {
-    case rtc::Socket::OPT_DONTFRAGMENT:
+    case talk_base::Socket::OPT_DONTFRAGMENT:
       NOTIMPLEMENTED();
       return -1;
 
-    case rtc::Socket::OPT_RCVBUF: {
+    case talk_base::Socket::OPT_RCVBUF: {
       int net_error = socket_->SetReceiveBufferSize(value);
       return (net_error == net::OK) ? 0 : -1;
     }
 
-    case rtc::Socket::OPT_SNDBUF: {
+    case talk_base::Socket::OPT_SNDBUF: {
       int net_error = socket_->SetSendBufferSize(value);
       return (net_error == net::OK) ? 0 : -1;
     }
 
-    case rtc::Socket::OPT_NODELAY:
+    case talk_base::Socket::OPT_NODELAY:
       // OPT_NODELAY is only for TCP sockets.
       NOTREACHED();
       return -1;
 
-    case rtc::Socket::OPT_IPV6_V6ONLY:
+    case talk_base::Socket::OPT_IPV6_V6ONLY:
       NOTIMPLEMENTED();
       return -1;
 
-    case rtc::Socket::OPT_DSCP:
+    case talk_base::Socket::OPT_DSCP:
       NOTIMPLEMENTED();
       return -1;
 
-    case rtc::Socket::OPT_RTP_SENDTIME_EXTN_ID:
+    case talk_base::Socket::OPT_RTP_SENDTIME_EXTN_ID:
       NOTIMPLEMENTED();
       return -1;
   }
 
   NOTREACHED();
   return -1;
 }
 
 int UdpPacketSocket::GetError() const {
   return error_;
@@ skipping 71 matching lines @@
     DoRead();
   }
 }
 
 void UdpPacketSocket::HandleReadResult(int result) {
   if (result == net::ERR_IO_PENDING) {
     return;
   }
 
   if (result > 0) {
-    rtc::SocketAddress address;
+    talk_base::SocketAddress address;
     if (!jingle_glue::IPEndPointToSocketAddress(receive_address_, &address)) {
       NOTREACHED();
       LOG(ERROR) << "Failed to convert address received from RecvFrom().";
       return;
     }
     SignalReadPacket(this, receive_buffer_->data(), result, address,
-                     rtc::CreatePacketTime(0));
+                     talk_base::CreatePacketTime(0));
   } else {
     LOG(ERROR) << "Received error when reading from UDP socket: " << result;
   }
 }
 
 }  // namespace
 
 ChromiumPacketSocketFactory::ChromiumPacketSocketFactory() {
 }
 
 ChromiumPacketSocketFactory::~ChromiumPacketSocketFactory() {
 }
 
-rtc::AsyncPacketSocket* ChromiumPacketSocketFactory::CreateUdpSocket(
-      const rtc::SocketAddress& local_address,
+talk_base::AsyncPacketSocket* ChromiumPacketSocketFactory::CreateUdpSocket(
+      const talk_base::SocketAddress& local_address,
       int min_port, int max_port) {
   scoped_ptr<UdpPacketSocket> result(new UdpPacketSocket());
   if (!result->Init(local_address, min_port, max_port))
     return NULL;
   return result.release();
 }
 
-rtc::AsyncPacketSocket*
+talk_base::AsyncPacketSocket*
 ChromiumPacketSocketFactory::CreateServerTcpSocket(
-    const rtc::SocketAddress& local_address,
+    const talk_base::SocketAddress& local_address,
     int min_port, int max_port,
     int opts) {
   // We don't use TCP sockets for remoting connections.
   NOTIMPLEMENTED();
   return NULL;
 }
 
-rtc::AsyncPacketSocket*
+talk_base::AsyncPacketSocket*
 ChromiumPacketSocketFactory::CreateClientTcpSocket(
-      const rtc::SocketAddress& local_address,
-      const rtc::SocketAddress& remote_address,
-      const rtc::ProxyInfo& proxy_info,
+      const talk_base::SocketAddress& local_address,
+      const talk_base::SocketAddress& remote_address,
+      const talk_base::ProxyInfo& proxy_info,
       const std::string& user_agent,
       int opts) {
   // We don't use TCP sockets for remoting connections.
   NOTREACHED();
   return NULL;
 }
 
-rtc::AsyncResolverInterface*
+talk_base::AsyncResolverInterface*
 ChromiumPacketSocketFactory::CreateAsyncResolver() {
-  return new rtc::AsyncResolver();
+  return new talk_base::AsyncResolver();
 }
 
 }  // namespace protocol
 }  // namespace remoting