| Index: net/websockets/websocket_basic_stream_test.cc
|
| diff --git a/net/websockets/websocket_basic_stream_test.cc b/net/websockets/websocket_basic_stream_test.cc
|
| index 71af0797818b41c21ca84f86d115a179bb51973b..8577d8cbaed3115568ebb62b88b646dbb205fc45 100644
|
| --- a/net/websockets/websocket_basic_stream_test.cc
|
| +++ b/net/websockets/websocket_basic_stream_test.cc
|
| @@ -65,11 +65,15 @@ const WebSocketMaskingKey kNonNulMaskingKey = {
|
|
|
| // A masking key generator function which generates the identity mask,
|
| // ie. "\0\0\0\0".
|
| -WebSocketMaskingKey GenerateNulMaskingKey() { return kNulMaskingKey; }
|
| +WebSocketMaskingKey GenerateNulMaskingKey() {
|
| + return kNulMaskingKey;
|
| +}
|
|
|
| // A masking key generation function which generates a fixed masking key with no
|
| // nul characters.
|
| -WebSocketMaskingKey GenerateNonNulMaskingKey() { return kNonNulMaskingKey; }
|
| +WebSocketMaskingKey GenerateNonNulMaskingKey() {
|
| + return kNonNulMaskingKey;
|
| +}
|
|
|
| // Base class for WebSocketBasicStream test fixtures.
|
| class WebSocketBasicStreamTest : public ::testing::Test {
|
| @@ -197,10 +201,7 @@ class WebSocketBasicStreamSocketChunkedReadTest
|
| // put in the last chunk. If LAST_FRAME_NOT_BIG is specified, then the last
|
| // frame will be no bigger than the rest of the frames (but it can be smaller,
|
| // if not enough data remains).
|
| - enum LastFrameBehaviour {
|
| - LAST_FRAME_BIG,
|
| - LAST_FRAME_NOT_BIG
|
| - };
|
| + enum LastFrameBehaviour { LAST_FRAME_BIG, LAST_FRAME_NOT_BIG };
|
|
|
| // Prepares a read from |data| of |data_size|, split into |number_of_chunks|,
|
| // each of |chunk_size| (except that the last chunk may be larger or
|
|
|