summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-29 16:42:20 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-29 23:42:57 +0000
commit9a31600726b75b2010edcdb651caefdc5dac644f (patch)
tree2f9e6fe204cf8fba25093a85fee4635ea68f41d5 /chrome/browser/sync/sync_error_notifier_ash_unittest.cc
parent9806e38bc8d0a0bd33a5fd4c4f8fd96ba716ba20 (diff)
downloadchromium_src-9a31600726b75b2010edcdb651caefdc5dac644f.zip
chromium_src-9a31600726b75b2010edcdb651caefdc5dac644f.tar.gz
chromium_src-9a31600726b75b2010edcdb651caefdc5dac644f.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=nick@chromium.org Review URL: https://codereview.chromium.org/686563003 Cr-Commit-Position: refs/heads/master@{#301981}
Diffstat (limited to 'chrome/browser/sync/sync_error_notifier_ash_unittest.cc')
-rw-r--r--chrome/browser/sync/sync_error_notifier_ash_unittest.cc16
1 files changed, 7 insertions, 9 deletions
diff --git a/chrome/browser/sync/sync_error_notifier_ash_unittest.cc b/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
index b1970d1..8215226 100644
--- a/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
+++ b/chrome/browser/sync/sync_error_notifier_ash_unittest.cc
@@ -64,23 +64,21 @@ class ScreenTypeDelegateDesktop : public gfx::ScreenTypeDelegate {
class FakeLoginUIService: public LoginUIService {
public:
FakeLoginUIService() : LoginUIService(NULL) {}
- virtual ~FakeLoginUIService() {}
+ ~FakeLoginUIService() override {}
};
class FakeLoginUI : public LoginUIService::LoginUI {
public:
FakeLoginUI() : focus_ui_call_count_(0) {}
- virtual ~FakeLoginUI() {}
+ ~FakeLoginUI() override {}
int focus_ui_call_count() const { return focus_ui_call_count_; }
private:
// LoginUIService::LoginUI:
- virtual void FocusUI() override {
- ++focus_ui_call_count_;
- }
- virtual void CloseUI() override {}
+ void FocusUI() override { ++focus_ui_call_count_; }
+ void CloseUI() override {}
int focus_ui_call_count_;
};
@@ -93,9 +91,9 @@ KeyedService* BuildMockLoginUIService(
class SyncErrorNotifierTest : public AshTestBase {
public:
SyncErrorNotifierTest() {}
- virtual ~SyncErrorNotifierTest() {}
+ ~SyncErrorNotifierTest() override {}
- virtual void SetUp() override {
+ void SetUp() override {
profile_manager_.reset(
new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
ASSERT_TRUE(profile_manager_->SetUp());
@@ -127,7 +125,7 @@ class SyncErrorNotifierTest : public AshTestBase {
notification_ui_manager_ = g_browser_process->notification_ui_manager();
}
- virtual void TearDown() override {
+ void TearDown() override {
error_notifier_->Shutdown();
service_.reset();
#if defined(OS_WIN)