Add P2PDatagramSocket and P2PStreamSocket interfaces.

remoting/protocol/connection_tester.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/protocol/connection_tester.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
-#include "net/socket/stream_socket.h"
+#include "remoting/protocol/p2p_datagram_socket.h"
+#include "remoting/protocol/p2p_stream_socket.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace remoting {
 namespace protocol {
 
-StreamConnectionTester::StreamConnectionTester(net::StreamSocket* client_socket,
-                                               net::StreamSocket* host_socket,
+StreamConnectionTester::StreamConnectionTester(P2PStreamSocket* client_socket,
+                                               P2PStreamSocket* host_socket,
                                                int message_size,
                                                int message_count)
     : message_loop_(base::MessageLoop::current()),
       host_socket_(host_socket),
       client_socket_(client_socket),
       message_size_(message_size),
       test_data_size_(message_size * message_count),
       done_(false),
       write_errors_(0),
       read_errors_(0) {
@@ skipping 91 matching lines @@
     read_errors_++;
     Done();
   } else if (result > 0) {
     // Allocate memory for the next read.
     input_buffer_->set_offset(input_buffer_->offset() + result);
     if (input_buffer_->offset() == test_data_size_)
       Done();
   }
 }
 
-DatagramConnectionTester::DatagramConnectionTester(net::Socket* client_socket,
-                                                   net::Socket* host_socket,
-                                                   int message_size,
-                                                   int message_count,
-                                                   int delay_ms)
+DatagramConnectionTester::DatagramConnectionTester(
+    P2PDatagramSocket* client_socket,
+    P2PDatagramSocket* host_socket,
+    int message_size,
+    int message_count,
+    int delay_ms)
     : message_loop_(base::MessageLoop::current()),
       host_socket_(host_socket),
       client_socket_(client_socket),
       message_size_(message_size),
       message_count_(message_count),
       delay_ms_(delay_ms),
       done_(false),
       write_errors_(0),
       read_errors_(0),
       packets_sent_(0),
@@ skipping 34 matching lines @@
   }
 
   scoped_refptr<net::IOBuffer> packet(new net::IOBuffer(message_size_));
   for (int i = 0; i < message_size_; ++i) {
     packet->data()[i] = static_cast<char>(i);
   }
   sent_packets_[packets_sent_] = packet;
   // Put index of this packet in the beginning of the packet body.
   memcpy(packet->data(), &packets_sent_, sizeof(packets_sent_));
 
-  int result = client_socket_->Write(
-      packet.get(),
-      message_size_,
+  int result = client_socket_->Send(
+      packet.get(), message_size_,
       base::Bind(&DatagramConnectionTester::OnWritten, base::Unretained(this)));
   HandleWriteResult(result);
 }
 
 void DatagramConnectionTester::OnWritten(int result) {
   HandleWriteResult(result);
 }
 
 void DatagramConnectionTester::HandleWriteResult(int result) {
   if (result <= 0 && result != net::ERR_IO_PENDING) {
     LOG(ERROR) << "Received error " << result << " when trying to write";
     write_errors_++;
     Done();
   } else if (result > 0) {
     EXPECT_EQ(message_size_, result);
     packets_sent_++;
     message_loop_->PostDelayedTask(
         FROM_HERE,
         base::Bind(&DatagramConnectionTester::DoWrite, base::Unretained(this)),
         base::TimeDelta::FromMilliseconds(delay_ms_));
   }
 }
 
 void DatagramConnectionTester::DoRead() {
   int result = 1;
   while (result > 0) {
     int kReadSize = message_size_ * 2;
     read_buffer_ = new net::IOBuffer(kReadSize);
 
-    result = host_socket_->Read(
-        read_buffer_.get(),
-        kReadSize,
+    result = host_socket_->Recv(
+        read_buffer_.get(), kReadSize,
         base::Bind(&DatagramConnectionTester::OnRead, base::Unretained(this)));
     HandleReadResult(result);
   };
 }
 
 void DatagramConnectionTester::OnRead(int result) {
   HandleReadResult(result);
   DoRead();
 }
 
@@ skipping 18 matching lines @@
         if (memcmp(read_buffer_->data(), sent_packets_[packet_id]->data(),
                    message_size_) != 0)
           bad_packets_received_++;
       }
     }
   }
 }
 
 }  // namespace protocol
 }  // namespace remoting