summaryrefslogtreecommitdiffstats
path: root/components/error_page
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-10-29 14:27:50 -0700
committerCommit bot <commit-bot@chromium.org>2014-10-29 21:28:20 +0000
commit30a1b15432dd20cf910f96ec35e27a94f769640e (patch)
treec9f5ffdb5c802fe2a26a22d499b700b49fe8f509 /components/error_page
parent6913b7737d6124633109d6e3da31689d7ffef838 (diff)
downloadchromium_src-30a1b15432dd20cf910f96ec35e27a94f769640e.zip
chromium_src-30a1b15432dd20cf910f96ec35e27a94f769640e.tar.gz
chromium_src-30a1b15432dd20cf910f96ec35e27a94f769640e.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=caitkp@chromium.org Review URL: https://codereview.chromium.org/684513002 Cr-Commit-Position: refs/heads/master@{#301931}
Diffstat (limited to 'components/error_page')
-rw-r--r--components/error_page/renderer/net_error_helper_core_unittest.cc12
1 files changed, 4 insertions, 8 deletions
diff --git a/components/error_page/renderer/net_error_helper_core_unittest.cc b/components/error_page/renderer/net_error_helper_core_unittest.cc
index 2402999..0aed025 100644
--- a/components/error_page/renderer/net_error_helper_core_unittest.cc
+++ b/components/error_page/renderer/net_error_helper_core_unittest.cc
@@ -159,14 +159,12 @@ class NetErrorHelperCoreTest : public testing::Test,
SetUpCore(false, false, true);
}
- virtual ~NetErrorHelperCoreTest() {
+ ~NetErrorHelperCoreTest() override {
// No test finishes while an error page is being fetched.
EXPECT_FALSE(is_url_being_fetched());
}
- virtual void SetUp() override {
- base::StatisticsRecorder::Initialize();
- }
+ void SetUp() override { base::StatisticsRecorder::Initialize(); }
void SetUpCore(bool auto_reload_enabled,
bool auto_reload_visible_only,
@@ -1939,7 +1937,7 @@ TEST_F(NetErrorHelperCoreTest, AutoReloadDisabled) {
class NetErrorHelperCoreAutoReloadTest : public NetErrorHelperCoreTest {
public:
- virtual void SetUp() {
+ void SetUp() override {
NetErrorHelperCoreTest::SetUp();
SetUpCore(true, false, true);
}
@@ -2243,9 +2241,7 @@ TEST_F(NetErrorHelperCoreAutoReloadTest, ShownWhileNotReloading) {
class NetErrorHelperCoreHistogramTest
: public NetErrorHelperCoreAutoReloadTest {
public:
- virtual void SetUp() override {
- NetErrorHelperCoreAutoReloadTest::SetUp();
- }
+ void SetUp() override { NetErrorHelperCoreAutoReloadTest::SetUp(); }
static const char kCountAtStop[];
static const char kErrorAtStop[];