Chromium style checker cleanup

Automated clean up of style checker errors that were missed due to the plugin
not being executed on implementation files.

BUG=115047
TBR=ben, brettw, jamesr, joi, satorux, piman, wez

Review URL: https://chromiumcodereview.appspot.com/12813004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188311 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 2 deletions

diff --git a/chromeos/network/onc/onc_merger.cc b/chromeos/network/onc/onc_merger.cc
index d5e6c65..7fecfb4 100644
--- a/chromeos/network/onc/onc_merger.cc
+++ b/chromeos/network/onc/onc_merger.cc
@@ -264,7 +264,8 @@ class MergeToEffective : public MergeSettingsAndPolicies {
   }
 
   // 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);
   }
@@ -276,7 +277,8 @@ class MergeToEffective : public MergeSettingsAndPolicies {
 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();