summaryrefslogtreecommitdiffstats
path: root/net/websockets/websocket_basic_stream_test.cc
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-27 14:47:29 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-27 21:48:18 +0000
commit67be2b1f8dbb8fe664365ce33cd6ccf2832e0663 (patch)
tree463de616ca38e98329059fff1709f9f0b8aa5a80 /net/websockets/websocket_basic_stream_test.cc
parentacfeaee6661ddd4cb0309a6faed1f4aeb8d24853 (diff)
downloadchromium_src-67be2b1f8dbb8fe664365ce33cd6ccf2832e0663.zip
chromium_src-67be2b1f8dbb8fe664365ce33cd6ccf2832e0663.tar.gz
chromium_src-67be2b1f8dbb8fe664365ce33cd6ccf2832e0663.tar.bz2
Standardize usage of virtual/override/final specifiers.
The Google C++ style guide states: Explicitly annotate overrides of virtual functions or virtual destructors with an override or (less frequently) final specifier. Older (pre-C++11) code will use the virtual keyword as an inferior alternative annotation. For clarity, use exactly one of override, final, or virtual when declaring an override. To better conform to these guidelines, the following constructs have been rewritten: - if a base class has a virtual destructor, then: virtual ~Foo(); -> ~Foo() override; - virtual void Foo() override; -> void Foo() override; - virtual void Foo() override final; -> void Foo() final; This patch was automatically generated. The clang plugin can generate fixit hints, which are suggested edits when it is 100% sure it knows how to fix a problem. The hints from the clang plugin were applied to the source tree using the tool in https://codereview.chromium.org/598073004. BUG=417463 R=pauljensen@chromium.org Review URL: https://codereview.chromium.org/663043004 Cr-Commit-Position: refs/heads/master@{#301452}
Diffstat (limited to 'net/websockets/websocket_basic_stream_test.cc')
-rw-r--r--net/websockets/websocket_basic_stream_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/websockets/websocket_basic_stream_test.cc b/net/websockets/websocket_basic_stream_test.cc
index 92b7d3f..2955ad6 100644
--- a/net/websockets/websocket_basic_stream_test.cc
+++ b/net/websockets/websocket_basic_stream_test.cc
@@ -110,7 +110,7 @@ class WebSocketBasicStreamSocketTest : public WebSocketBasicStreamTest {
generator_(&GenerateNulMaskingKey),
expect_all_io_to_complete_(true) {}
- virtual ~WebSocketBasicStreamSocketTest() {
+ ~WebSocketBasicStreamSocketTest() override {
// stream_ has a reference to socket_data_ (via MockTCPClientSocket) and so
// should be destroyed first.
stream_.reset();
@@ -237,7 +237,7 @@ class WebSocketBasicStreamSocketWriteTest
protected:
// All write tests use the same frame, so it is easiest to create it during
// test creation.
- virtual void SetUp() override { PrepareWriteFrame(); }
+ void SetUp() override { PrepareWriteFrame(); }
// Creates a WebSocketFrame with a wire format matching kWriteFrame and adds
// it to |frames_|.