| 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 c0862f51433760e517bf778fa9869cc0292d56c3..029a9de9fb2bed335f9d85239e78599404df1167 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
|
| @@ -38,7 +38,7 @@
|
| #include "ppapi/host/ppapi_host.h"
|
| #include "ppapi/host/resource_host.h"
|
| #include "ppapi/proxy/ppapi_messages.h"
|
| -#include "ppapi/proxy/tcp_socket_resource_base.h"
|
| +#include "ppapi/proxy/tcp_socket_resource_constants.h"
|
| #include "ppapi/shared_impl/private/net_address_private_impl.h"
|
|
|
| #if defined(OS_CHROMEOS)
|
| @@ -47,7 +47,7 @@
|
|
|
| using ppapi::NetAddressPrivateImpl;
|
| using ppapi::host::NetErrorToPepperError;
|
| -using ppapi::proxy::TCPSocketResourceBase;
|
| +using ppapi::proxy::TCPSocketResourceConstants;
|
| using ppapi::TCPSocketState;
|
| using ppapi::TCPSocketVersion;
|
|
|
| @@ -369,7 +369,7 @@ int32_t PepperTCPSocketMessageFilter::OnMsgRead(
|
| if (read_buffer_.get())
|
| return PP_ERROR_INPROGRESS;
|
| if (bytes_to_read <= 0 ||
|
| - bytes_to_read > TCPSocketResourceBase::kMaxReadSize) {
|
| + bytes_to_read > TCPSocketResourceConstants::kMaxReadSize) {
|
| return PP_ERROR_BADARGUMENT;
|
| }
|
|
|
| @@ -412,7 +412,8 @@ int32_t PepperTCPSocketMessageFilter::OnMsgWrite(
|
|
|
| size_t data_size = data.size();
|
| if (data_size == 0 ||
|
| - data_size > static_cast<size_t>(TCPSocketResourceBase::kMaxWriteSize)) {
|
| + data_size >
|
| + static_cast<size_t>(TCPSocketResourceConstants::kMaxWriteSize)) {
|
| return PP_ERROR_BADARGUMENT;
|
| }
|
|
|
| @@ -524,9 +525,8 @@ int32_t PepperTCPSocketMessageFilter::OnMsgSetOption(
|
| }
|
| case PP_TCPSOCKET_OPTION_SEND_BUFFER_SIZE: {
|
| int32_t integer_value = 0;
|
| - if (!value.GetInt32(&integer_value) ||
|
| - integer_value <= 0 ||
|
| - integer_value > TCPSocketResourceBase::kMaxSendBufferSize)
|
| + if (!value.GetInt32(&integer_value) || integer_value <= 0 ||
|
| + integer_value > TCPSocketResourceConstants::kMaxSendBufferSize)
|
| return PP_ERROR_BADARGUMENT;
|
|
|
| // If the socket is already connected, proxy the value to TCPSocket.
|
| @@ -542,9 +542,8 @@ int32_t PepperTCPSocketMessageFilter::OnMsgSetOption(
|
| }
|
| case PP_TCPSOCKET_OPTION_RECV_BUFFER_SIZE: {
|
| int32_t integer_value = 0;
|
| - if (!value.GetInt32(&integer_value) ||
|
| - integer_value <= 0 ||
|
| - integer_value > TCPSocketResourceBase::kMaxReceiveBufferSize)
|
| + if (!value.GetInt32(&integer_value) || integer_value <= 0 ||
|
| + integer_value > TCPSocketResourceConstants::kMaxReceiveBufferSize)
|
| return PP_ERROR_BADARGUMENT;
|
|
|
| // If the socket is already connected, proxy the value to TCPSocket.
|
|
|