Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(688)

Unified Diff: net/websockets/websocket_end_to_end_test.cc

Issue 1399303002: net/websockets: Convert int types from basictypes.h to the ones from stdint.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: websocket_deflate_stream.cc Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/websockets/websocket_deflate_stream.cc ('k') | net/websockets/websocket_event_interface.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/websockets/websocket_end_to_end_test.cc
diff --git a/net/websockets/websocket_end_to_end_test.cc b/net/websockets/websocket_end_to_end_test.cc
index 0dfa60cc6712e9d5b22b77448e18aaf33af0bc13..fef2809557028d433fb288faa2142c1467d33072 100644
--- a/net/websockets/websocket_end_to_end_test.cc
+++ b/net/websockets/websocket_end_to_end_test.cc
@@ -8,6 +8,7 @@
// inefficient. However, it makes these tests a good fit for scenarios which
// require special server configurations.
+#include <stdint.h>
#include <string>
#include "base/bind.h"
@@ -68,12 +69,12 @@ class ConnectTestingEventInterface : public WebSocketEventInterface {
WebSocketMessageType type,
const std::vector<char>& data) override;
- ChannelState OnFlowControl(int64 quota) override;
+ ChannelState OnFlowControl(int64_t quota) override;
ChannelState OnClosingHandshake() override;
ChannelState OnDropChannel(bool was_clean,
- uint16 code,
+ uint16_t code,
const std::string& reason) override;
ChannelState OnFailChannel(const std::string& message) override;
@@ -141,7 +142,7 @@ ChannelState ConnectTestingEventInterface::OnDataFrame(
return CHANNEL_ALIVE;
}
-ChannelState ConnectTestingEventInterface::OnFlowControl(int64 quota) {
+ChannelState ConnectTestingEventInterface::OnFlowControl(int64_t quota) {
return CHANNEL_ALIVE;
}
@@ -151,7 +152,7 @@ ChannelState ConnectTestingEventInterface::OnClosingHandshake() {
ChannelState ConnectTestingEventInterface::OnDropChannel(
bool was_clean,
- uint16 code,
+ uint16_t code,
const std::string& reason) {
return CHANNEL_DELETED;
}
« no previous file with comments | « net/websockets/websocket_deflate_stream.cc ('k') | net/websockets/websocket_event_interface.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698