Update {virtual,override,final} to follow C++11 style in chromeos/network.

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 a ChromeOS build using a
variation of https://codereview.chromium.org/598073004.

BUG=417463
R=gauravsh@chromium.org

Review URL: https://codereview.chromium.org/799753007

Cr-Commit-Position: refs/heads/master@{#312270}

8 files changed, 41 insertions, 47 deletions

diff --git a/chromeos/network/onc/onc_certificate_importer_impl.h b/chromeos/network/onc/onc_certificate_importer_impl.h
index 899ab58..c1f2e15 100644
--- a/chromeos/network/onc/onc_certificate_importer_impl.h
+++ b/chromeos/network/onc/onc_certificate_importer_impl.h
@@ -45,12 +45,12 @@ class CHROMEOS_EXPORT CertificateImporterImpl : public CertificateImporter {
   CertificateImporterImpl(
       const scoped_refptr<base::SequencedTaskRunner>& io_task_runner,
       net::NSSCertDatabase* target_nssdb_);
-  virtual ~CertificateImporterImpl();
+  ~CertificateImporterImpl() override;
 
   // CertificateImporter overrides
-  virtual void ImportCertificates(const base::ListValue& certificates,
-                                  ::onc::ONCSource source,
-                                  const DoneCallback& done_callback) override;
+  void ImportCertificates(const base::ListValue& certificates,
+                          ::onc::ONCSource source,
+                          const DoneCallback& done_callback) override;
 
  private:
   void RunDoneCallback(const CertificateImporter::DoneCallback& callback,
diff --git a/chromeos/network/onc/onc_certificate_importer_impl_unittest.cc b/chromeos/network/onc/onc_certificate_importer_impl_unittest.cc
index 362676b..ca94105 100644
--- a/chromeos/network/onc/onc_certificate_importer_impl_unittest.cc
+++ b/chromeos/network/onc/onc_certificate_importer_impl_unittest.cc
@@ -65,9 +65,9 @@ net::CertType GetCertType(net::X509Certificate::OSCertHandle cert) {
 class ONCCertificateImporterImplTest : public testing::Test {
  public:
   ONCCertificateImporterImplTest() {}
-  virtual ~ONCCertificateImporterImplTest() {}
+  ~ONCCertificateImporterImplTest() override {}
 
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(public_nssdb_.is_open());
     ASSERT_TRUE(private_nssdb_.is_open());
 
@@ -84,7 +84,7 @@ class ONCCertificateImporterImplTest : public testing::Test {
     EXPECT_TRUE(ListCertsInPrivateSlot().empty());
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     thread_task_runner_handle_.reset();
     task_runner_ = NULL;
   }
diff --git a/chromeos/network/onc/onc_merger.cc b/chromeos/network/onc/onc_merger.cc
index 51d8241..931c3f0 100644
--- a/chromeos/network/onc/onc_merger.cc
+++ b/chromeos/network/onc/onc_merger.cc
@@ -215,7 +215,7 @@ class MergeSettingsAndPolicies : public MergeListOfDictionaries {
   }
 
   // MergeListOfDictionaries override.
-  virtual scoped_ptr<base::Value> MergeListOfValues(
+  scoped_ptr<base::Value> MergeListOfValues(
       const std::string& key,
       const std::vector<const base::Value*>& values) override {
     bool user_editable = !HasUserPolicy();
@@ -303,9 +303,8 @@ class MergeToEffective : public MergeSettingsAndPolicies {
   }
 
   // MergeSettingsAndPolicies override.
-  virtual scoped_ptr<base::Value> MergeValues(
-      const std::string& key,
-      const ValueParams& values) override {
+  scoped_ptr<base::Value> MergeValues(const std::string& key,
+                                      const ValueParams& values) override {
     std::string which;
     return MergeValues(key, values, &which);
   }
@@ -358,9 +357,8 @@ class MergeToAugmented : public MergeToEffective {
 
  protected:
   // MergeSettingsAndPolicies override.
-  virtual scoped_ptr<base::Value> MergeValues(
-      const std::string& key,
-      const ValueParams& values) override {
+  scoped_ptr<base::Value> MergeValues(const std::string& key,
+                                      const ValueParams& values) override {
     const OncFieldSignature* field = NULL;
     if (signature_)
       field = GetFieldSignature(*signature_, key);
@@ -447,9 +445,8 @@ class MergeToAugmented : public MergeToEffective {
   }
 
   // MergeListOfDictionaries override.
-  virtual DictionaryPtr MergeNestedDictionaries(
-      const std::string& key,
-      const DictPtrs &dicts) override {
+  DictionaryPtr MergeNestedDictionaries(const std::string& key,
+                                        const DictPtrs& dicts) override {
     DictionaryPtr result;
     if (signature_) {
       const OncValueSignature* enclosing_signature = signature_;
diff --git a/chromeos/network/onc/onc_merger_unittest.cc b/chromeos/network/onc/onc_merger_unittest.cc
index 3c9b8f0..262bbba 100644
--- a/chromeos/network/onc/onc_merger_unittest.cc
+++ b/chromeos/network/onc/onc_merger_unittest.cc
@@ -55,7 +55,7 @@ class ONCMergerTest : public testing::Test {
   scoped_ptr<const base::DictionaryValue> device_policy_;
   scoped_ptr<const base::DictionaryValue> active_;
 
-  virtual void SetUp() {
+  void SetUp() override {
     policy_ = test_utils::ReadTestDictionary("managed_vpn.onc");
     policy_without_recommended_ =
         test_utils::ReadTestDictionary("managed_vpn_without_recommended.onc");
diff --git a/chromeos/network/onc/onc_normalizer.h b/chromeos/network/onc/onc_normalizer.h
index 9c97d32..2ee0935 100644
--- a/chromeos/network/onc/onc_normalizer.h
+++ b/chromeos/network/onc/onc_normalizer.h
@@ -17,7 +17,7 @@ struct OncValueSignature;
 class CHROMEOS_EXPORT Normalizer : public Mapper {
  public:
   explicit Normalizer(bool remove_recommended_fields);
-  virtual ~Normalizer();
+  ~Normalizer() override;
 
   // Removes all fields that are ignored/irrelevant because of the value of
   // other fields. E.g. the "WiFi" field is irrelevant if the configurations
@@ -34,7 +34,7 @@ class CHROMEOS_EXPORT Normalizer : public Mapper {
 
  private:
   // Dispatch to the right normalization function according to |signature|.
-  virtual scoped_ptr<base::DictionaryValue> MapObject(
+  scoped_ptr<base::DictionaryValue> MapObject(
       const OncValueSignature& signature,
       const base::DictionaryValue& onc_object,
       bool* error) override;
diff --git a/chromeos/network/onc/onc_utils.cc b/chromeos/network/onc/onc_utils.cc
index 1eaee85..6045ef1 100644
--- a/chromeos/network/onc/onc_utils.cc
+++ b/chromeos/network/onc/onc_utils.cc
@@ -292,12 +292,11 @@ class OncMaskValues : public Mapper {
       : mask_(mask) {
   }
 
-  virtual scoped_ptr<base::Value> MapField(
-      const std::string& field_name,
-      const OncValueSignature& object_signature,
-      const base::Value& onc_value,
-      bool* found_unknown_field,
-      bool* error) override {
+  scoped_ptr<base::Value> MapField(const std::string& field_name,
+                                   const OncValueSignature& object_signature,
+                                   const base::Value& onc_value,
+                                   bool* found_unknown_field,
+                                   bool* error) override {
     if (FieldIsCredential(object_signature, field_name)) {
       return scoped_ptr<base::Value>(new base::StringValue(mask_));
     } else {
diff --git a/chromeos/network/onc/onc_utils_unittest.cc b/chromeos/network/onc/onc_utils_unittest.cc
index 90ce28a..f5acd5d 100644
--- a/chromeos/network/onc/onc_utils_unittest.cc
+++ b/chromeos/network/onc/onc_utils_unittest.cc
@@ -58,8 +58,8 @@ const char* kLoginEmail = "hans@my.domain.com";
 class StringSubstitutionStub : public StringSubstitution {
  public:
   StringSubstitutionStub() {}
-  virtual bool GetSubstitute(const std::string& placeholder,
-                             std::string* substitute) const override {
+  bool GetSubstitute(const std::string& placeholder,
+                     std::string* substitute) const override {
     if (placeholder == ::onc::substitutes::kLoginIDField)
       *substitute = kLoginId;
     else if (placeholder ==::onc::substitutes::kEmailField)
diff --git a/chromeos/network/onc/onc_validator.h b/chromeos/network/onc/onc_validator.h
index 5a5cf6a..b535f9f 100644
--- a/chromeos/network/onc/onc_validator.h
+++ b/chromeos/network/onc/onc_validator.h
@@ -69,7 +69,7 @@ class CHROMEOS_EXPORT Validator : public Mapper {
             bool error_on_missing_field,
             bool managed_onc);
 
-  virtual ~Validator();
+  ~Validator() override;
 
   // Sets the ONC source to |source|. If not set, defaults to ONC_SOURCE_NONE.
   // If the source is set to ONC_SOURCE_DEVICE_POLICY, validation additionally
@@ -102,39 +102,37 @@ class CHROMEOS_EXPORT Validator : public Mapper {
   // Overridden from Mapper:
   // Compare |onc_value|s type with |onc_type| and validate/repair according to
   // |signature|. On error returns NULL.
-  virtual scoped_ptr<base::Value> MapValue(const OncValueSignature& signature,
-                                           const base::Value& onc_value,
-                                           bool* error) override;
+  scoped_ptr<base::Value> MapValue(const OncValueSignature& signature,
+                                   const base::Value& onc_value,
+                                   bool* error) override;
 
   // Dispatch to the right validation function according to
   // |signature|. Iterates over all fields and recursively validates/repairs
   // these. All valid fields are added to the result dictionary. Returns the
   // repaired dictionary. Only on error returns NULL.
-  virtual scoped_ptr<base::DictionaryValue> MapObject(
+  scoped_ptr<base::DictionaryValue> MapObject(
       const OncValueSignature& signature,
       const base::DictionaryValue& onc_object,
       bool* error) override;
 
   // Pushes/pops the |field_name| to |path_|, otherwise like |Mapper::MapField|.
-  virtual scoped_ptr<base::Value> MapField(
-      const std::string& field_name,
-      const OncValueSignature& object_signature,
-      const base::Value& onc_value,
-      bool* found_unknown_field,
-      bool* error) override;
+  scoped_ptr<base::Value> MapField(const std::string& field_name,
+                                   const OncValueSignature& object_signature,
+                                   const base::Value& onc_value,
+                                   bool* found_unknown_field,
+                                   bool* error) override;
 
   // Ignores nested errors in NetworkConfigurations and Certificates, otherwise
   // like |Mapper::MapArray|.
-  virtual scoped_ptr<base::ListValue> MapArray(
-      const OncValueSignature& array_signature,
-      const base::ListValue& onc_array,
-      bool* nested_error) override;
+  scoped_ptr<base::ListValue> MapArray(const OncValueSignature& array_signature,
+                                       const base::ListValue& onc_array,
+                                       bool* nested_error) override;
 
   // Pushes/pops the index to |path_|, otherwise like |Mapper::MapEntry|.
-  virtual scoped_ptr<base::Value> MapEntry(int index,
-                                           const OncValueSignature& signature,
-                                           const base::Value& onc_value,
-                                           bool* error) override;
+  scoped_ptr<base::Value> MapEntry(int index,
+                                   const OncValueSignature& signature,
+                                   const base::Value& onc_value,
+                                   bool* error) override;
 
   // This is the default validation of objects/dictionaries. Validates
   // |onc_object| according to |object_signature|. |result| must point to a