replace OVERRIDE and FINAL with override and final in chromeos/

chromeos/network/onc/onc_merger.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/network/onc/onc_merger.h"
 
 #include <set>
 #include <string>
 #include <vector>
 
@@ skipping 199 matching lines @@
   }
 
   // Whether a device policy was provided.
   bool HasDevicePolicy() {
     return hasDevicePolicy_;
   }
 
   // MergeListOfDictionaries override.
   virtual scoped_ptr<base::Value> MergeListOfValues(
       const std::string& key,
-      const std::vector<const base::Value*>& values) OVERRIDE {
+      const std::vector<const base::Value*>& values) override {
     bool user_editable = !HasUserPolicy();
     if (values[kUserEditableIndex])
       values[kUserEditableIndex]->GetAsBoolean(&user_editable);
 
     bool device_editable = !HasDevicePolicy();
     if (values[kDeviceEditableIndex])
       values[kDeviceEditableIndex]->GetAsBoolean(&device_editable);
 
     ValueParams params;
     params.user_policy = values[kUserPolicyIndex];
@@ skipping 67 matching lines @@
       // dictionaries contained a value for it.
     }
     if (result)
       return make_scoped_ptr(result->DeepCopy());
     return scoped_ptr<base::Value>();
   }
 
   // MergeSettingsAndPolicies override.
   virtual scoped_ptr<base::Value> MergeValues(
       const std::string& key,
-      const ValueParams& values) OVERRIDE {
+      const ValueParams& values) override {
     std::string which;
     return MergeValues(key, values, &which);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MergeToEffective);
 };
 
 namespace {
 
@@ skipping 34 matching lines @@
                                                device_policy,
                                                user_settings,
                                                shared_settings,
                                                active_settings);
   }
 
  protected:
   // MergeSettingsAndPolicies override.
   virtual scoped_ptr<base::Value> MergeValues(
       const std::string& key,
-      const ValueParams& values) OVERRIDE {
+      const ValueParams& values) override {
     const OncFieldSignature* field = NULL;
     if (signature_)
       field = GetFieldSignature(*signature_, key);
 
     if (!field) {
       // This field is not part of the provided ONCSignature, thus it cannot be
       // controlled by policy. Return the plain active value instead of an
       // augmented dictionary.
       return make_scoped_ptr(values.active_setting->DeepCopy());
     }
@@ skipping 64 matching lines @@
           ::onc::kAugmentationDeviceEditable, true);
     }
     if (augmented_value->empty())
       augmented_value.reset();
     return augmented_value.PassAs<base::Value>();
   }
 
   // MergeListOfDictionaries override.
   virtual DictionaryPtr MergeNestedDictionaries(
       const std::string& key,
-      const DictPtrs &dicts) OVERRIDE {
+      const DictPtrs &dicts) override {
     DictionaryPtr result;
     if (signature_) {
       const OncValueSignature* enclosing_signature = signature_;
       signature_ = NULL;
 
       const OncFieldSignature* field =
           GetFieldSignature(*enclosing_signature, key);
       if (field)
         signature_ = field->value_signature;
       result = MergeToEffective::MergeNestedDictionaries(key, dicts);
@@ skipping 30 matching lines @@
     const base::DictionaryValue* shared_settings,
     const base::DictionaryValue* active_settings) {
   MergeToAugmented merger;
   return merger.MergeDictionaries(
       signature, user_policy, device_policy, user_settings, shared_settings,
       active_settings);
 }
 
 }  // namespace onc
 }  // namespace chromeos