Remove timing limitation of SetOption invocation for PPAPI sockets.

content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc

Index: content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
diff --git a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
index 459aa918fb8e4dcac90e6e5b4763b97d612027f6..ed180743c7168899c5077951f4cf0e76157e9e2a 100644
--- a/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
+++ b/content/browser/renderer_host/pepper/pepper_tcp_socket_message_filter.cc
@@ -63,6 +63,7 @@ PepperTCPSocketMessageFilter::PepperTCPSocketMessageFilter(
       state_(TCPSocketState::INITIAL),
       end_of_file_reached_(false),
       bind_input_addr_(NetAddressPrivateImpl::kInvalidNetAddress),
+      socket_options_(SOCKET_OPTION_NODELAY),

[bbudge, 2014/12/09 18:37:37]

Even though not strictly necessary in this case, we generally initialize all
fields, so initialize rcvbuf_size and sndbuf_size here.
Here and below.

[hidehiko, 2014/12/09 19:51:42]

Done.

       address_index_(0),
       socket_(new net::TCPSocket(NULL, net::NetLog::Source())),
       ssl_context_helper_(host->ssl_context_helper()),
@@ -90,6 +91,7 @@ PepperTCPSocketMessageFilter::PepperTCPSocketMessageFilter(
       state_(TCPSocketState::CONNECTED),
       end_of_file_reached_(false),
       bind_input_addr_(NetAddressPrivateImpl::kInvalidNetAddress),
+      socket_options_(SOCKET_OPTION_NODELAY),
       address_index_(0),
       socket_(socket.Pass()),
       ssl_context_helper_(host->ssl_context_helper()),
@@ -456,35 +458,57 @@ int32_t PepperTCPSocketMessageFilter::OnMsgSetOption(
 
   switch (name) {
     case PP_TCPSOCKET_OPTION_NO_DELAY: {
-      if (state_.state() != TCPSocketState::CONNECTED)
-        return PP_ERROR_FAILED;
-
       bool boolean_value = false;
       if (!value.GetBool(&boolean_value))
         return PP_ERROR_BADARGUMENT;
-      return socket_->SetNoDelay(boolean_value) ? PP_OK : PP_ERROR_FAILED;
+
+      // If the socket is already connected, proxy the value to TCPSocket.
+      if (state_.state() == TCPSocketState::CONNECTED)
+        return socket_->SetNoDelay(boolean_value) ? PP_OK : PP_ERROR_FAILED;
+
+      // TCPSocket instance is not yet created. So remember the value here.
+      if (boolean_value) {
+        socket_options_ |= SOCKET_OPTION_NODELAY;
+      } else {
+        socket_options_ &= ~SOCKET_OPTION_NODELAY;
+      }
+      return PP_OK;
     }
-    case PP_TCPSOCKET_OPTION_SEND_BUFFER_SIZE:
-    case PP_TCPSOCKET_OPTION_RECV_BUFFER_SIZE: {
-      if (state_.state() != TCPSocketState::CONNECTED)
-        return PP_ERROR_FAILED;
+    case PP_TCPSOCKET_OPTION_SEND_BUFFER_SIZE: {
+      int32_t integer_value = 0;
+      if (!value.GetInt32(&integer_value) ||
+          integer_value <= 0 ||
+          integer_value > TCPSocketResourceBase::kMaxSendBufferSize)
+        return PP_ERROR_BADARGUMENT;
 
+      // If the socket is already connected, proxy the value to TCPSocket.
+      if (state_.state() == TCPSocketState::CONNECTED) {
+        return NetErrorToPepperError(
+            socket_->SetSendBufferSize(integer_value));
+      }
+
+      // TCPSocket instance is not yet created. So remember the value here.
+      socket_options_ |= SOCKET_OPTION_SNDBUF_SIZE;
+      sndbuf_size_ = integer_value;
+      return PP_OK;
+    }
+    case PP_TCPSOCKET_OPTION_RECV_BUFFER_SIZE: {
       int32_t integer_value = 0;
-      if (!value.GetInt32(&integer_value) || integer_value <= 0)
+      if (!value.GetInt32(&integer_value) ||
+          integer_value <= 0 ||
+          integer_value > TCPSocketResourceBase::kMaxReceiveBufferSize)
         return PP_ERROR_BADARGUMENT;
 
-      int net_result = net::ERR_UNEXPECTED;
-      if (name == PP_TCPSOCKET_OPTION_SEND_BUFFER_SIZE) {
-        if (integer_value > TCPSocketResourceBase::kMaxSendBufferSize)
-          return PP_ERROR_BADARGUMENT;
-        net_result = socket_->SetSendBufferSize(integer_value);
-      } else {
-        if (integer_value > TCPSocketResourceBase::kMaxReceiveBufferSize)
-          return PP_ERROR_BADARGUMENT;
-        net_result = socket_->SetReceiveBufferSize(integer_value);
+      // If the socket is already connected, proxy the value to TCPSocket.
+      if (state_.state() == TCPSocketState::CONNECTED) {
+        return NetErrorToPepperError(
+            socket_->SetReceiveBufferSize(integer_value));
       }
-      // TODO(wtc): Add error mapping code.
-      return (net_result == net::OK) ? PP_OK : PP_ERROR_FAILED;
+
+      // TCPSocket instance is not yet created. So remember the value here.
+      socket_options_ |= SOCKET_OPTION_RCVBUF_SIZE;
+      rcvbuf_size_ = integer_value;
+      return PP_OK;
     }
     default: {
       NOTREACHED();
@@ -690,17 +714,42 @@ void PepperTCPSocketMessageFilter::StartConnect(
   DCHECK(state_.IsPending(TCPSocketState::CONNECT));
   DCHECK_LT(address_index_, address_list_.size());
 
-  int net_result = net::OK;
-  if (!socket_->IsValid())
-    net_result = socket_->Open(address_list_[address_index_].GetFamily());
+  if (!socket_->IsValid()) {
+    int net_result = socket_->Open(address_list_[address_index_].GetFamily());
+    if (net_result != net::OK) {
+      OnConnectCompleted(context, net_result);
+      return;
+    }
+  }
+
+  socket_->SetDefaultOptionsForClient();
 
-  if (net_result == net::OK) {
-    net_result = socket_->Connect(
-        address_list_[address_index_],
-        base::Bind(&PepperTCPSocketMessageFilter::OnConnectCompleted,
-                   base::Unretained(this),
-                   context));
+  if (!(socket_options_ & SOCKET_OPTION_NODELAY)) {
+    if (!socket_->SetNoDelay(false)) {
+      OnConnectCompleted(context, net::ERR_FAILED);
+      return;
+    }
   }
+  if (socket_options_ & SOCKET_OPTION_RCVBUF_SIZE) {
+    int net_result = socket_->SetReceiveBufferSize(rcvbuf_size_);
+    if (net_result != net::OK) {
+      OnConnectCompleted(context, net_result);
+      return;
+    }
+  }
+  if (socket_options_ & SOCKET_OPTION_SNDBUF_SIZE) {
+    int net_result = socket_->SetSendBufferSize(sndbuf_size_);
+    if (net_result != net::OK) {
+      OnConnectCompleted(context, net_result);
+      return;
+    }
+  }
+
+  int net_result = socket_->Connect(
+      address_list_[address_index_],
+      base::Bind(&PepperTCPSocketMessageFilter::OnConnectCompleted,
+                 base::Unretained(this),
+                 context));
   if (net_result != net::ERR_IO_PENDING)
     OnConnectCompleted(context, net_result);
 }
@@ -748,7 +797,6 @@ void PepperTCPSocketMessageFilter::OnConnectCompleted(
       break;
     }
 
-    socket_->SetDefaultOptionsForClient();
     SendConnectReply(context, PP_OK, local_addr, remote_addr);
     state_.CompletePendingTransition(true);
     return;