Index: net/websockets/websocket_channel.cc |
diff --git a/net/websockets/websocket_channel.cc b/net/websockets/websocket_channel.cc |
index 767d632daf2d5b1f57bede371a46f4cab4a5c809..8c264f1313c33cd6b4189535f400a5e154bffa92 100644 |
--- a/net/websockets/websocket_channel.cc |
+++ b/net/websockets/websocket_channel.cc |
@@ -430,8 +430,8 @@ void WebSocketChannel::SendFlowControl(int64 quota) { |
const size_t bytes_to_send = |
std::min(base::checked_cast<size_t>(quota), data_size); |
const bool final = front.final() && data_size == bytes_to_send; |
- const char* data = front.data() ? |
- front.data()->data() + front.offset() : NULL; |
+ const char* data = |
+ front.data().get() ? front.data()->data() + front.offset() : NULL; |
wtc
2014/08/26 18:27:58
I was curious about this reformatting because we c
dcheng
2014/08/26 18:34:14
Yeah I'm not sure either. I think it has some heur
|
DCHECK(!bytes_to_send || data) << "Non empty data should not be null."; |
const std::vector<char> data_vector(data, data + bytes_to_send); |
DVLOG(3) << "Sending frame previously split due to quota to the " |