summaryrefslogtreecommitdiffstats
path: root/base/test
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2015-02-05 19:32:20 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-06 03:33:22 +0000
commit8e3e03ecaadd10689ee34e65dce9d39cef123d65 (patch)
treed3cfb727aab88d146b41d45ba0bd86e80508a724 /base/test
parent5b459de080948b999f50194e468c38c8d71e8384 (diff)
downloadchromium_src-8e3e03ecaadd10689ee34e65dce9d39cef123d65.zip
chromium_src-8e3e03ecaadd10689ee34e65dce9d39cef123d65.tar.gz
chromium_src-8e3e03ecaadd10689ee34e65dce9d39cef123d65.tar.bz2
Update {virtual,override,final} to follow C++11 style in base.
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 automatically generated with an OS=android build using a variation of https://codereview.chromium.org/598073004. BUG=417463 Review URL: https://codereview.chromium.org/900613004 Cr-Commit-Position: refs/heads/master@{#314951}
Diffstat (limited to 'base/test')
-rw-r--r--base/test/test_support_android.cc17
1 files changed, 6 insertions, 11 deletions
diff --git a/base/test/test_support_android.cc b/base/test/test_support_android.cc
index eeab9ee..11a0871 100644
--- a/base/test/test_support_android.cc
+++ b/base/test/test_support_android.cc
@@ -72,14 +72,14 @@ class Waitable {
// The MessagePumpForUI implementation for test purpose.
class MessagePumpForUIStub : public base::MessagePumpForUI {
- virtual ~MessagePumpForUIStub() {}
+ ~MessagePumpForUIStub() override {}
- virtual void Start(base::MessagePump::Delegate* delegate) override {
+ void Start(base::MessagePump::Delegate* delegate) override {
NOTREACHED() << "The Start() method shouldn't be called in test, using"
" Run() method should be used.";
}
- virtual void Run(base::MessagePump::Delegate* delegate) override {
+ void Run(base::MessagePump::Delegate* delegate) override {
// The following was based on message_pump_glib.cc, except we're using a
// WaitableEvent since there are no native message loop to use.
RunState state(delegate, g_state ? g_state->run_depth + 1 : 1);
@@ -119,16 +119,11 @@ class MessagePumpForUIStub : public base::MessagePumpForUI {
g_state = previous_state;
}
- virtual void Quit() override {
- Waitable::GetInstance()->Quit();
- }
+ void Quit() override { Waitable::GetInstance()->Quit(); }
- virtual void ScheduleWork() override {
- Waitable::GetInstance()->Signal();
- }
+ void ScheduleWork() override { Waitable::GetInstance()->Signal(); }
- virtual void ScheduleDelayedWork(
- const base::TimeTicks& delayed_work_time) override {
+ void ScheduleDelayedWork(const base::TimeTicks& delayed_work_time) override {
Waitable::GetInstance()->Signal();
}
};