diff options
author | nick <nick@chromium.org> | 2015-04-23 11:55:54 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-23 18:55:55 +0000 |
commit | c3a924fd8ec1041f3320c6d784d98da681719d95 (patch) | |
tree | 8e1310a3d49799c8ffde1edd4287a738b218c4d7 /jingle | |
parent | a81c6b032cce4a474bfb26fb061d82104fe71f66 (diff) | |
download | chromium_src-c3a924fd8ec1041f3320c6d784d98da681719d95.zip chromium_src-c3a924fd8ec1041f3320c6d784d98da681719d95.tar.gz chromium_src-c3a924fd8ec1041f3320c6d784d98da681719d95.tar.bz2 |
Update {virtual,override} to follow C++11 style in jingle.
The Google style guide states that only one of {virtual,override,final} should be used for each declaration, since override implies virtual and final implies both virtual and override.
This patch was manually generated using a regex and a text editor.
BUG=417463
Review URL: https://codereview.chromium.org/1063453006
Cr-Commit-Position: refs/heads/master@{#326596}
Diffstat (limited to 'jingle')
-rw-r--r-- | jingle/notifier/listener/xmpp_push_client_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jingle/notifier/listener/xmpp_push_client_unittest.cc b/jingle/notifier/listener/xmpp_push_client_unittest.cc index bd0b46d..abe6775 100644 --- a/jingle/notifier/listener/xmpp_push_client_unittest.cc +++ b/jingle/notifier/listener/xmpp_push_client_unittest.cc @@ -38,14 +38,14 @@ class XmppPushClientTest : public testing::Test { message_loop_.message_loop_proxy()); } - virtual ~XmppPushClientTest() {} + ~XmppPushClientTest() override {} - virtual void SetUp() override { + void SetUp() override { xmpp_push_client_.reset(new XmppPushClient(notifier_options_)); xmpp_push_client_->AddObserver(&mock_observer_); } - virtual void TearDown() override { + void TearDown() override { // Clear out any messages posted by XmppPushClient. message_loop_.RunUntilIdle(); xmpp_push_client_->RemoveObserver(&mock_observer_); |