Revert "Update webrtc&libjingle 6774:6799."

remoting/client/plugin/pepper_packet_socket_factory.cc

 // 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.
 
 #include "remoting/client/plugin/pepper_packet_socket_factory.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "ppapi/cpp/net_address.h"
 #include "ppapi/cpp/udp_socket.h"
 #include "ppapi/utility/completion_callback_factory.h"
 #include "remoting/client/plugin/pepper_util.h"
 #include "remoting/protocol/socket_util.h"
-#include "third_party/webrtc/base/asyncpacketsocket.h"
+#include "third_party/libjingle/source/talk/base/asyncpacketsocket.h"
 
 namespace remoting {
 
 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
@@ skipping 47 matching lines @@
       return net::ERR_NETWORK_ACCESS_DENIED;
     case PP_ERROR_MESSAGE_TOO_BIG:
       return net::ERR_MSG_TOO_BIG;
     case PP_ERROR_ADDRESS_IN_USE:
       return net::ERR_ADDRESS_IN_USE;
     default:
       return net::ERR_FAILED;
   }
 }
 
-class UdpPacketSocket : public rtc::AsyncPacketSocket {
+class UdpPacketSocket : public talk_base::AsyncPacketSocket {
  public:
   explicit UdpPacketSocket(const pp::InstanceHandle& instance);
   virtual ~UdpPacketSocket();
 
   // |min_port| and |max_port| are set to zero if the port number
   // should be assigned by the OS.
-  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 opt, int* value) OVERRIDE;
-  virtual int SetOption(rtc::Socket::Option opt, int value) OVERRIDE;
+  virtual int GetOption(talk_base::Socket::Option opt, int* value) OVERRIDE;
+  virtual int SetOption(talk_base::Socket::Option opt, 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 pp::NetAddress& address);
 
     scoped_refptr<net::IOBufferWithSize> data;
@@ skipping 10 matching lines @@
   void OnReadCompleted(int result, pp::NetAddress address);
   void HandleReadResult(int result, pp::NetAddress address);
 
   pp::InstanceHandle instance_;
 
   pp::UDPSocket socket_;
 
   State state_;
   int error_;
 
-  rtc::SocketAddress local_address_;
+  talk_base::SocketAddress local_address_;
 
   // Used to scan ports when necessary. Both values are set to 0 when
   // the port number is assigned by OS.
   uint16_t min_port_;
   uint16_t max_port_;
 
   std::vector<char> receive_buffer_;
 
   bool send_pending_;
   std::list<PendingPacket> send_queue_;
@@ skipping 23 matching lines @@
       max_port_(0),
       send_pending_(false),
       send_queue_size_(0),
       callback_factory_(this) {
 }
 
 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) {
   if (socket_.is_null()) {
     return false;
   }
 
   local_address_ = local_address;
   max_port_ = max_port;
   min_port_ = min_port;
 
@@ skipping 39 matching lines @@
           callback_factory_.NewCallback(&UdpPacketSocket::OnBindCompleted);
       int result = socket_.Bind(pp_local_address, callback);
       DCHECK_EQ(result, PP_OK_COMPLETIONPENDING);
     }
   } else {
     LOG(ERROR) << "Failed to bind UDP socket to " << local_address_.ToString()
                << ", error: " << result;
   }
 }
 
-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) {
     // TODO(sergeyu): StunPort may try to send stun request before we
     // are bound. Fix that problem and change this to DCHECK.
     return EINVAL;
   }
 
   if (error_ != 0) {
     return error_;
   }
 
@@ skipping 11 matching lines @@
   DoSend();
   return data_size;
 }
 
 int UdpPacketSocket::Close() {
   state_ = STATE_CLOSED;
   socket_.Close();
   return 0;
 }
 
-rtc::AsyncPacketSocket::State UdpPacketSocket::GetState() const {
+talk_base::AsyncPacketSocket::State UdpPacketSocket::GetState() const {
   return state_;
 }
 
-int UdpPacketSocket::GetOption(rtc::Socket::Option opt, int* value) {
+int UdpPacketSocket::GetOption(talk_base::Socket::Option opt, int* value) {
   // Options are not supported for Pepper UDP sockets.
   return -1;
 }
 
-int UdpPacketSocket::SetOption(rtc::Socket::Option opt, int value) {
+int UdpPacketSocket::SetOption(talk_base::Socket::Option opt, int value) {
   // Options are not supported for Pepper UDP sockets.
   return -1;
 }
 
 int UdpPacketSocket::GetError() const {
   return error_;
 }
 
 void UdpPacketSocket::SetError(int error) {
   error_ = error;
@@ skipping 63 matching lines @@
 
 void UdpPacketSocket::OnReadCompleted(int result, pp::NetAddress address) {
   HandleReadResult(result, address);
   if (result > 0) {
     DoRead();
   }
 }
 
 void UdpPacketSocket::HandleReadResult(int result, pp::NetAddress address) {
   if (result > 0) {
-    rtc::SocketAddress socket_address;
+    talk_base::SocketAddress socket_address;
     PpNetAddressToSocketAddress(address, &socket_address);
     SignalReadPacket(this, &receive_buffer_[0], result, socket_address,
-                     rtc::CreatePacketTime(0));
+                     talk_base::CreatePacketTime(0));
   } else if (result != PP_ERROR_ABORTED) {
     LOG(ERROR) << "Received error when reading from UDP socket: " << result;
   }
 }
 
 }  // namespace
 
 PepperPacketSocketFactory::PepperPacketSocketFactory(
     const pp::InstanceHandle& instance)
     : pp_instance_(instance) {
 }
 
 PepperPacketSocketFactory::~PepperPacketSocketFactory() {
 }
 
-rtc::AsyncPacketSocket* PepperPacketSocketFactory::CreateUdpSocket(
-      const rtc::SocketAddress& local_address,
+talk_base::AsyncPacketSocket* PepperPacketSocketFactory::CreateUdpSocket(
+      const talk_base::SocketAddress& local_address,
       int min_port,
       int max_port) {
   scoped_ptr<UdpPacketSocket> result(new UdpPacketSocket(pp_instance_));
   if (!result->Init(local_address, min_port, max_port))
     return NULL;
   return result.release();
 }
 
-rtc::AsyncPacketSocket* PepperPacketSocketFactory::CreateServerTcpSocket(
-    const rtc::SocketAddress& local_address,
+talk_base::AsyncPacketSocket* PepperPacketSocketFactory::CreateServerTcpSocket(
+    const talk_base::SocketAddress& local_address,
     int min_port,
     int max_port,
     int opts) {
   // We don't use TCP sockets for remoting connections.
   NOTREACHED();
   return NULL;
 }
 
-rtc::AsyncPacketSocket* PepperPacketSocketFactory::CreateClientTcpSocket(
-      const rtc::SocketAddress& local_address,
-      const rtc::SocketAddress& remote_address,
-      const rtc::ProxyInfo& proxy_info,
+talk_base::AsyncPacketSocket* PepperPacketSocketFactory::CreateClientTcpSocket(
+      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*
 PepperPacketSocketFactory::CreateAsyncResolver() {
   NOTREACHED();
   return NULL;
 }
 
 }  // namespace remoting