diff options
author | nick <nick@chromium.org> | 2015-04-22 21:43:15 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-23 04:43:34 +0000 |
commit | e81b3346126a4f586992ed502256eba5b43f1e19 (patch) | |
tree | 629366b092d147e3888b60de95b9a9fd8e6b8dae /chromeos | |
parent | 8787d39596aa89b0e83dc89b361e1eb80253e246 (diff) | |
download | chromium_src-e81b3346126a4f586992ed502256eba5b43f1e19.zip chromium_src-e81b3346126a4f586992ed502256eba5b43f1e19.tar.gz chromium_src-e81b3346126a4f586992ed502256eba5b43f1e19.tar.bz2 |
Update {virtual,override} to follow C++11 style in chromeos.
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/1101763002
Cr-Commit-Position: refs/heads/master@{#326453}
Diffstat (limited to 'chromeos')
-rw-r--r-- | chromeos/dbus/nfc_client_unittest.cc | 6 | ||||
-rw-r--r-- | chromeos/dbus/shill_client_unittest_base.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/chromeos/dbus/nfc_client_unittest.cc b/chromeos/dbus/nfc_client_unittest.cc index 7870e48..736853b 100644 --- a/chromeos/dbus/nfc_client_unittest.cc +++ b/chromeos/dbus/nfc_client_unittest.cc @@ -88,9 +88,9 @@ class MockNfcTagObserver : public NfcTagClient::Observer { class NfcClientTest : public testing::Test { public: NfcClientTest() : response_(NULL) {} - virtual ~NfcClientTest() {} + ~NfcClientTest() override {} - virtual void SetUp() override { + void SetUp() override { // Create the mock bus. dbus::Bus::Options options; options.bus_type = dbus::Bus::SYSTEM; @@ -222,7 +222,7 @@ class NfcClientTest : public testing::Test { message_loop_.RunUntilIdle(); } - virtual void TearDown() override { + void TearDown() override { tag_client_->RemoveObserver(&mock_tag_observer_); device_client_->RemoveObserver(&mock_device_observer_); adapter_client_->RemoveObserver(&mock_adapter_observer_); diff --git a/chromeos/dbus/shill_client_unittest_base.h b/chromeos/dbus/shill_client_unittest_base.h index d7b8cde..9b32490 100644 --- a/chromeos/dbus/shill_client_unittest_base.h +++ b/chromeos/dbus/shill_client_unittest_base.h @@ -45,10 +45,10 @@ class ValueMatcher : public MatcherInterface<const base::Value&> { explicit ValueMatcher(const base::Value& value); // MatcherInterface overrides. - virtual bool MatchAndExplain(const base::Value& value, - MatchResultListener* listener) const override; - virtual void DescribeTo(::std::ostream* os) const override; - virtual void DescribeNegationTo(::std::ostream* os) const override; + bool MatchAndExplain(const base::Value& value, + MatchResultListener* listener) const override; + void DescribeTo(::std::ostream* os) const override; + void DescribeNegationTo(::std::ostream* os) const override; private: scoped_ptr<base::Value> expected_value_; |