summaryrefslogtreecommitdiffstats
path: root/net/websockets/websocket_deflate_stream_test.cc
diff options
context:
space:
mode:
authormostynb <mostynb@opera.com>2014-10-09 04:01:13 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-09 11:01:43 +0000
commitba063d6038f4e0df5188cdd46589c62388d8e06b (patch)
tree5dd4b0be08ab43875cb16ed59f4c2c281f6c7412 /net/websockets/websocket_deflate_stream_test.cc
parentc239532659a8ac3422094ffbd9f90e38abe0bf48 (diff)
downloadchromium_src-ba063d6038f4e0df5188cdd46589c62388d8e06b.zip
chromium_src-ba063d6038f4e0df5188cdd46589c62388d8e06b.tar.gz
chromium_src-ba063d6038f4e0df5188cdd46589c62388d8e06b.tar.bz2
replace OVERRIDE and FINAL with override and final in net/
BUG=417463 Review URL: https://codereview.chromium.org/623213004 Cr-Commit-Position: refs/heads/master@{#298844}
Diffstat (limited to 'net/websockets/websocket_deflate_stream_test.cc')
-rw-r--r--net/websockets/websocket_deflate_stream_test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/websockets/websocket_deflate_stream_test.cc b/net/websockets/websocket_deflate_stream_test.cc
index 590f616..4f1c418 100644
--- a/net/websockets/websocket_deflate_stream_test.cc
+++ b/net/websockets/websocket_deflate_stream_test.cc
@@ -125,10 +125,10 @@ class WebSocketDeflatePredictorMock : public WebSocketDeflatePredictor {
// WebSocketDeflatePredictor functions.
virtual Result Predict(const ScopedVector<WebSocketFrame>& frames,
- size_t frame_index) OVERRIDE {
+ size_t frame_index) override {
return result_;
}
- virtual void RecordInputDataFrame(const WebSocketFrame* frame) OVERRIDE {
+ virtual void RecordInputDataFrame(const WebSocketFrame* frame) override {
if (!WebSocketFrameHeader::IsKnownDataOpCode(frame->header.opcode)) {
ADD_FAILURE() << "Control frames should not be recorded.";
return;
@@ -147,7 +147,7 @@ class WebSocketDeflatePredictorMock : public WebSocketDeflatePredictor {
}
frames_to_be_input_.pop_front();
}
- virtual void RecordWrittenDataFrame(const WebSocketFrame* frame) OVERRIDE {
+ virtual void RecordWrittenDataFrame(const WebSocketFrame* frame) override {
if (!WebSocketFrameHeader::IsKnownDataOpCode(frame->header.opcode)) {
ADD_FAILURE() << "Control frames should not be recorded.";
return;