summaryrefslogtreecommitdiffstats
path: root/base/json
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2014-12-22 18:56:47 -0800
committerCommit bot <commit-bot@chromium.org>2014-12-23 02:57:28 +0000
commit8aef3761e6ff2a3315d23810187e5f52462db30f (patch)
tree83cd8d5442cfc2376b24f2b99c52945792b9b3b1 /base/json
parent34fead5eae3de03b4b63acbdbe8491f75e353232 (diff)
downloadchromium_src-8aef3761e6ff2a3315d23810187e5f52462db30f.zip
chromium_src-8aef3761e6ff2a3315d23810187e5f52462db30f.tar.gz
chromium_src-8aef3761e6ff2a3315d23810187e5f52462db30f.tar.bz2
Standardize usage of virtual/override/final specifiers in base/.
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. Several formatting edits by clang-format were manually reverted, due to mangling of some of the more complicate IPC macros. BUG=417463 Review URL: https://codereview.chromium.org/804533005 Cr-Commit-Position: refs/heads/master@{#309527}
Diffstat (limited to 'base/json')
-rw-r--r--base/json/json_value_serializer_unittest.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/base/json/json_value_serializer_unittest.cc b/base/json/json_value_serializer_unittest.cc
index dc43693..e3c349c 100644
--- a/base/json/json_value_serializer_unittest.cc
+++ b/base/json/json_value_serializer_unittest.cc
@@ -372,9 +372,7 @@ TEST(JSONValueSerializerTest, JSONReaderComments) {
class JSONFileValueSerializerTest : public testing::Test {
protected:
- virtual void SetUp() override {
- ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
- }
+ void SetUp() override { ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); }
base::ScopedTempDir temp_dir_;
};