From 2bcca5574426bd380d58a7d4ed2ac206b447eb3e Mon Sep 17 00:00:00 2001 From: dcheng Date: Tue, 21 Oct 2014 17:46:21 -0700 Subject: Standardize usage of virtual/override/final in chrome/browser/safe_browsing/ 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=mattm@chromium.org Review URL: https://codereview.chromium.org/657373004 Cr-Commit-Position: refs/heads/master@{#300586} --- .../safe_browsing/safe_browsing_blocking_page_unittest.cc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc') diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc index 6656837..700183d 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc @@ -51,8 +51,7 @@ class TestSafeBrowsingUIManager: public SafeBrowsingUIManager { : SafeBrowsingUIManager(service) { } - virtual void SendSerializedMalwareDetails( - const std::string& serialized) override { + void SendSerializedMalwareDetails(const std::string& serialized) override { details_.push_back(serialized); } @@ -61,7 +60,7 @@ class TestSafeBrowsingUIManager: public SafeBrowsingUIManager { } private: - virtual ~TestSafeBrowsingUIManager() {} + ~TestSafeBrowsingUIManager() override {} std::list details_; }; @@ -70,9 +69,9 @@ class TestSafeBrowsingBlockingPageFactory : public SafeBrowsingBlockingPageFactory { public: TestSafeBrowsingBlockingPageFactory() { } - virtual ~TestSafeBrowsingBlockingPageFactory() { } + ~TestSafeBrowsingBlockingPageFactory() override {} - virtual SafeBrowsingBlockingPage* CreateSafeBrowsingPage( + SafeBrowsingBlockingPage* CreateSafeBrowsingPage( SafeBrowsingUIManager* manager, WebContents* web_contents, const SafeBrowsingBlockingPage::UnsafeResourceList& unsafe_resources) -- cgit v1.1