Chromium style checker cleanup

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 246 matching lines @@
     } else {
       // Can be reached if the current field is recommended, but none of the
       // 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(ValueParams values) {
+  virtual scoped_ptr<base::Value> MergeValues(
+      ValueParams values) OVERRIDE {
     std::string which;
     return MergeValues(values, &which);
   }
 };
 
 // Call MergeDictionaries to merge policies and settings to an augmented
 // dictionary which contains a dictionary for each value in the original
 // dictionaries. See the description of MergeSettingsAndPoliciesToAugmented.
 class MergeToAugmented : public MergeToEffective {
  protected:
   // MergeSettingsAndPolicies override.
-  virtual scoped_ptr<base::Value> MergeValues(ValueParams values) {
+  virtual scoped_ptr<base::Value> MergeValues(
+      ValueParams values) OVERRIDE {
     scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue);
     std::string which_effective;
     MergeToEffective::MergeValues(values, &which_effective).reset();
     if (!which_effective.empty()) {
       result->SetStringWithoutPathExpansion(kAugmentationEffectiveSetting,
                                             which_effective);
     }
     if (values.user_policy) {
       result->SetWithoutPathExpansion(kAugmentationUserPolicy,
                                       values.user_policy->DeepCopy());
@@ skipping 39 matching lines @@
     const base::DictionaryValue* device_policy,
     const base::DictionaryValue* user_settings,
     const base::DictionaryValue* shared_settings) {
   MergeToAugmented merger;
   return merger.MergeDictionaries(
       user_policy, device_policy, user_settings, shared_settings);
 }
 
 }  // namespace onc
 }  // namespace chromeos