| Index: net/websockets/websocket_basic_stream.cc
|
| ===================================================================
|
| --- net/websockets/websocket_basic_stream.cc (revision 245415)
|
| +++ net/websockets/websocket_basic_stream.cc (working copy)
|
| @@ -12,7 +12,7 @@
|
| #include "base/basictypes.h"
|
| #include "base/bind.h"
|
| #include "base/logging.h"
|
| -#include "base/safe_numerics.h"
|
| +#include "base/numerics/safe_conversions.h"
|
| #include "net/base/io_buffer.h"
|
| #include "net/base/net_errors.h"
|
| #include "net/socket/client_socket_handle.h"
|
| @@ -347,10 +347,10 @@
|
| // header. A check for exact equality can only be used when the whole frame
|
| // arrives in one chunk.
|
| DCHECK_GE(current_frame_header_->payload_length,
|
| - base::checked_numeric_cast<uint64>(chunk_size));
|
| + base::checked_cast<uint64>(chunk_size));
|
| DCHECK(!is_first_chunk || !is_final_chunk ||
|
| current_frame_header_->payload_length ==
|
| - base::checked_numeric_cast<uint64>(chunk_size));
|
| + base::checked_cast<uint64>(chunk_size));
|
|
|
| // Convert the chunk to a complete frame.
|
| *frame = CreateFrame(is_final_chunk, data_buffer);
|
|
|